Merge pull request #7902 from adrian-prantl/119385604-5.10

Add missing nullptr check

Author: adrian-prantl

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp

@@ -428,9 +428,10 @@ SwiftLanguageRuntimeImpl::emplaceClangTypeInfo(
   return &*it_b.first->second;
 }
 
-llvm::Optional<uint64_t> SwiftLanguageRuntimeImpl::GetMemberVariableOffsetRemoteMirrors(
-    CompilerType instance_type, ValueObject *instance, llvm::StringRef member_name,
-    Status *error) {
+llvm::Optional<uint64_t>
+SwiftLanguageRuntimeImpl::GetMemberVariableOffsetRemoteMirrors(
+    CompilerType instance_type, ValueObject *instance,
+    llvm::StringRef member_name, Status *error) {
   LLDB_LOGF(GetLog(LLDBLog::Types), "using remote mirrors");
   auto ts =
       instance_type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwiftTypeRef>();

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeRemoteAST.cpp

@@ -83,14 +83,14 @@ SwiftLanguageRuntimeImpl::GetMemberVariableOffsetRemoteAST(
     llvm::StringRef member_name) {
   auto scratch_ctx =
       instance_type.GetTypeSystem().dyn_cast_or_null<SwiftASTContext>();
-  if (scratch_ctx == nullptr || scratch_ctx->HasFatalErrors())
+  if (!scratch_ctx || scratch_ctx->HasFatalErrors())
     return {};
 
   auto *remote_ast = &GetRemoteASTContext(*scratch_ctx);
   // Check whether we've already cached this offset.
   swift::TypeBase *swift_type =
       GetCanonicalSwiftType(instance_type).getPointer();
-  if (swift_type == nullptr)
+  if (!swift_type)
     return {};
 
   // Perform the cache lookup.
@@ -142,6 +142,9 @@ SwiftLanguageRuntimeImpl::GetMemberVariableOffsetRemoteAST(
         }
   }
 
+  if (!swift_type)
+    return {};
+
   // Try to determine whether it is safe to use RemoteAST.  RemoteAST
   // is faster than RemoteMirrors, but can't do dynamic types (checked
   // inside RemoteAST) or incomplete types (checked here).