Merge pull request #8054 from adrian-prantl/reenable-objcconflicttest

Reenable objcconflicttest

Author: adrian-prantl

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

@@ -609,6 +609,12 @@ SwiftLanguageRuntimeImpl::GetNumChildren(CompilerType type,
         root, {Kind::TypeMangling, Kind::Type, Kind::BuiltinTypeName});
     if (builtin_type)
       return 0;
+    LLDB_LOG(GetLog(LLDBLog::Types),
+             "{0}: unrecognized builtin type info or this is a Clang type with "
+             "DWARF debug info",
+             type.GetMangledTypeName());
+    return {};
+
   }
   // Structs and Tuples.
   if (auto *rti = llvm::dyn_cast<swift::reflection::RecordTypeInfo>(ti)) {

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py

@@ -40,7 +40,10 @@ def test(self):
             'break here', lldb.SBFileSpec('Foo.swift'))
         process.Continue()
         self.expect("fr var foo", "expected result", substrs=["23"])
+        precise = self.dbg.GetSetting('symbols.swift-precise-compiler-invocation').GetBooleanValue()
+        if not precise:
+            return
         # FIXME: This should work with precise compiler invocations.
-        #self.expect("expression foo", "expected result", substrs=["$R3", "23"])
-        #self.expect("expression $R3", "expected result", substrs=["23"])
-        #self.expect("expression $R4", "expected result", substrs=["23"])
+        self.expect("expression foo", "expected result", substrs=["$R3", "23"])
+        self.expect("expression $R3", "expected result", substrs=["23"])
+        self.expect("expression $R4", "expected result", substrs=["23"])

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/dylib.mk

@@ -2,7 +2,7 @@ DYLIB_ONLY := YES
 DYLIB_NAME := $(BASENAME)
 DYLIB_SWIFT_SOURCES := $(DYLIB_NAME).swift
 SWIFT_BRIDGING_HEADER := $(DYLIB_NAME)/$(DYLIB_NAME)-Bridging.h
-SWIFT_PRECOMPILE_BRIDGING_HEADER := NO
+SWIFT_PRECOMPILE_BRIDGING_HEADER := YES
 SWIFT_OBJC_HEADER = $(DYLIB_NAME)-Swift.h
 SWIFT_OBJC_INTEROP := 1
 SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR)