Merge pull request #1021 from augusto2112/check_if_objc_runtime_null

Check if objc runtime pointer is null before using it

Author: adrian-prantl

lldb/source/Core/ValueObject.cpp

@@ -363,23 +363,24 @@ CompilerType ValueObject::MaybeCalculateCompleteType() {
   }
 
   // then try the runtime
-  std::vector<CompilerDecl> compiler_decls;
-  auto *objc_language_runtime = ObjCLanguageRuntime::Get(*process_sp);
-  if (auto runtime_vendor = objc_language_runtime->GetDeclVendor()) {
-    if (runtime_vendor->FindDecls(class_name, false, UINT32_MAX,
-                                  compiler_decls) > 0 &&
-        compiler_decls.size() > 0) {
-      auto *ctx = llvm::dyn_cast<TypeSystemClang>(compiler_decls[0].GetTypeSystem());
-      if (ctx) {
-        CompilerType runtime_type =
-            ctx->GetTypeForDecl(compiler_decls[0].GetOpaqueDecl());
-        m_override_type =
-          is_pointer_type ? runtime_type.GetPointerType() : runtime_type;
+  if (auto *objc_language_runtime = ObjCLanguageRuntime::Get(*process_sp)) {
+    if (auto *runtime_vendor = objc_language_runtime->GetDeclVendor()) {
+      std::vector<CompilerDecl> compiler_decls;
+      runtime_vendor->FindDecls(class_name, false, UINT32_MAX, compiler_decls);
+      if (!compiler_decls.empty()) {
+        auto *ctx =
+            llvm::dyn_cast<TypeSystemClang>(compiler_decls[0].GetTypeSystem());
+        if (ctx) {
+          CompilerType runtime_type =
+              ctx->GetTypeForDecl(compiler_decls[0].GetOpaqueDecl());
+          m_override_type =
+              is_pointer_type ? runtime_type.GetPointerType() : runtime_type;
+        }
       }
-    }
 
-    if (m_override_type.IsValid())
-      return m_override_type;
+      if (m_override_type.IsValid())
+        return m_override_type;
+    }
   }
   return compiler_type;
 }

lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp

@@ -159,8 +159,11 @@ bool lldb_private::formatters::swift::Measurement_SummaryProvider(
   if (!process_sp)
     return false;
 
-  auto descriptor_sp(
-      ObjCLanguageRuntime::Get(*process_sp)->GetClassDescriptor(*unit_sp));
+  ObjCLanguageRuntime *objc_runtime = ObjCLanguageRuntime::Get(*process_sp);
+  if (!objc_runtime)
+    return false;
+
+  auto descriptor_sp(objc_runtime->GetClassDescriptor(*unit_sp));
   if (!descriptor_sp)
     return false;
 

lldb/test/API/lang/swift/stdlib/ContiguousArray/Makefile

@@ -0,0 +1,3 @@
+SWIFT_SOURCES := main.swift
+
+include Makefile.rules

lldb/test/API/lang/swift/stdlib/ContiguousArray/TestContiguousArray.py

@@ -0,0 +1,28 @@
+"""
+Test that contiguous array prints correctly
+"""
+import lldb
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbutil as lldbutil
+import os
+import unittest2
+
+
+class TestContiguousArray(lldbtest.TestBase):
+
+    mydir = lldbtest.TestBase.compute_mydir(__file__)
+
+    @swiftTest
+    def test_frame_contiguous_array(self):
+        """Test that contiguous array prints correctly"""
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
+
+        self.expect("frame variable --dynamic-type run-target",
+                    startstr="""(ContiguousArray<a.Class>) array = {
+  _buffer = {
+    _storage = 1 value {
+      [0] = 0x""")
+

lldb/test/API/lang/swift/stdlib/ContiguousArray/main

@@ -0,0 +1,11 @@
+class Class {}
+
+func use<T>(_ t: T) {}
+
+func main() {
+	let array = ContiguousArray<Class>([Class()])
+	use(array)// Set breakpoint here
+}
+
+main()
+