2 files changed, 5 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
index 16f77e898c5..4aa3e0b2d15 100644
--- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
+++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp
@@ -783,7 +783,8 @@ static uint64_t decodeTaggedTimeInterval(uint64_t encodedTimeInterval) {
   if (encodedTimeInterval == std::numeric_limits<uint64_t>::max())
     return (uint64_t)-0.0;
 
-  TaggedDoubleBits encodedBits = { .i = encodedTimeInterval };
+  TaggedDoubleBits encodedBits = {};
+  encodedBits.i = encodedTimeInterval;
   DoubleBits decodedBits;
 
   // Sign and fraction are represented exactly.
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
index c272f93b37e..a0ebf42d810 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.cpp
@@ -190,15 +190,15 @@ thread_result_t GDBRemoteCommunicationReplayServer::AsyncThread(void *arg) {
         case eBroadcastBitAsyncContinue:
           ReceivePacket(*server, done);
           if (done)
-            return nullptr;
+            return {};
           break;
         case eBroadcastBitAsyncThreadShouldExit:
         default:
-          return nullptr;
+          return {};
         }
       }
     }
   }
 
-  return nullptr;
+  return {};
 }