Merge pull request #11080 from adrian-prantl/156542351

[LLDB] Prefer serialized bridging headers.

Author: adrian-prantl

lldb/include/lldb/Core/ModuleList.h

@@ -86,6 +86,7 @@ class ModuleListProperties : public Properties {
   bool GetSwiftLoadConformances() const;
   SwiftModuleLoadingMode GetSwiftModuleLoadingMode() const;
   bool SetSwiftModuleLoadingMode(SwiftModuleLoadingMode);
+  bool GetSwiftPreferSerializedBridgingHeader() const;
 
   bool GetEnableSwiftMetadataCache() const;
   uint64_t GetSwiftMetadataCacheMaxByteSize();

lldb/source/Core/CoreProperties.td

@@ -40,6 +40,9 @@ let Definition = "modulelist" in {
     DefaultEnumValue<"eSwiftModuleLoadingModePreferSerialized">,
     EnumValues<"OptionEnumValues(g_swift_module_loading_mode_enums)">,
     Desc<"The module loading mode to use when loading modules for Swift.">;
+  def SwiftPreferSerializedBridgingHeader: Property<"swift-prefer-serialized-bridging-header", "Boolean">,
+    DefaultTrue,
+    Desc<"Prefer serialized preprocessed bridging headers in Swift modules over on-disk headers.">;
   def EnableSwiftMetadataCache: Property<"enable-swift-metadata-cache", "Boolean">,
     Global,
     DefaultTrue,

lldb/source/Core/ModuleList.cpp

@@ -224,6 +224,12 @@ bool ModuleListProperties::SetSwiftModuleLoadingMode(SwiftModuleLoadingMode mode
   return SetPropertyAtIndex(idx, mode);
 }
 
+bool ModuleListProperties::GetSwiftPreferSerializedBridgingHeader() const {
+  const uint32_t idx = ePropertySwiftPreferSerializedBridgingHeader;
+  return GetPropertyAtIndexAs<bool>(
+      idx, g_modulelist_properties[idx].default_uint_value != 0);
+}
+
 FileSpec ModuleListProperties::GetSwiftMetadataCachePath() const {
   return m_collection_sp
       ->GetPropertyAtIndexAsOptionValueFileSpec(ePropertySwiftMetadataCachePath)

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -3472,6 +3472,8 @@ swift::ClangImporterOptions &SwiftASTContext::GetClangImporterOptions() {
     if (FileSystem::Instance().Exists(clang_dir_spec))
       clang_importer_options.OverrideResourceDir = clang_dir_spec.GetPath();
     clang_importer_options.DebuggerSupport = true;
+    clang_importer_options.PreferSerializedBridgingHeader =
+        props.GetSwiftPreferSerializedBridgingHeader();
 
     clang_importer_options.DisableSourceImport =
         !props.GetUseSwiftClangImporter();

lldb/source/Plugins/TypeSystem/Swift/SwiftDWARFImporterForClangTypes.cpp

@@ -88,7 +88,8 @@ void SwiftDWARFImporterForClangTypes::lookupValue(
         continue;
       auto ts = module_sp->GetTypeSystemForLanguage(lldb::eLanguageTypeSwift);
       if (!ts) {
-        llvm::consumeError(ts.takeError());
+        LLDB_LOG_ERROR(GetLog(LLDBLog::Types), ts.takeError(),
+                       "no Swift type system: {0}");
         continue;
       }
       auto swift_ts = llvm::dyn_cast_or_null<TypeSystemSwift>(ts->get());
@@ -127,7 +128,9 @@ void SwiftDWARFImporterDelegate::importType(
       from_ctx.getSourceManager().getFileManager(), false);
   llvm::Expected<clang::QualType> clang_type(importer.Import(qual_type));
   if (!clang_type) {
-    llvm::consumeError(clang_type.takeError());
+    LLDB_LOG_ERROR(GetLog(LLDBLog::Types), clang_type.takeError(),
+                   "could not import DWARF type {1} into Clang AST: {0}",
+                   qual_type.getAsString());
     return;
   }
 

lldb/test/API/lang/swift/clangimporter/extra_clang_flags/TestSwiftExtraClangFlags.py

@@ -29,6 +29,7 @@ def test_extra_clang_flags(self):
         # Because the bridging header isn't precompiled or in a module
         # we don't have DWARF type information for the types it contains.
         self.expect("settings set symbols.swift-typesystem-compiler-fallback true")
+        self.expect("settings set symbols.swift-prefer-serialized-bridging-header false")
 
         # FIXME: this doesn't work if LLDB's build dir contains a space.
         overlay = self.getBuildArtifact('overlay.yaml')
@@ -71,6 +72,7 @@ def test_invalid_extra_clang_flags(self):
         self.addTearDownHook(
             lambda: self.runCmd("settings clear target.swift-extra-clang-flags"))
 
+        self.expect("settings set symbols.swift-prefer-serialized-bridging-header false")
         self.expect('settings set target.swift-extra-clang-flags -- -v')
 
         lldbutil.run_to_source_breakpoint(self, "break here",

lldb/test/API/lang/swift/explicit_modules/bridgingheader/M.h

@@ -0,0 +1 @@
+struct M { int j; };

lldb/test/API/lang/swift/explicit_modules/bridgingheader/Makefile

@@ -0,0 +1,14 @@
+SWIFT_SOURCES := main.swift
+SWIFT_ENABLE_EXPLICIT_MODULES := Yes
+SWIFT_BRIDGING_HEADER := bridging.h
+SWIFTFLAGS_EXTRAS = -Xcc -I$(BUILDDIR)/secret
+
+all: secret.h $(EXE)
+
+include Makefile.rules
+
+.PHONY: secret.h
+
+secret.h:
+	mkdir -p $(BUILDDIR)/secret
+	echo "struct S { int i; };" > $(BUILDDIR)/secret/secret.h

lldb/test/API/lang/swift/explicit_modules/bridgingheader/TestSwiftExplicitModulesBridgingHeader.py

@@ -0,0 +1,30 @@
+import lldb
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbutil as lldbutil
+
+
+class TestSwiftExplicitModules(lldbtest.TestBase):
+    NO_DEBUG_INFO_TESTCASE = True
+    @swiftTest
+    @skipIf(setting=('symbols.use-swift-clangimporter', 'false'), bugnumber='rdar://157258485')
+    def test(self):
+        """Test explicit Swift modules with bridging headers"""
+        self.build()
+        secret = self.getBuildArtifact("secret")
+        import shutil
+        shutil.rmtree(secret)
+
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
+        log = self.getBuildArtifact("types.log")
+        self.expect('log enable lldb types -f "%s"' % log)
+
+        self.expect("frame variable s", substrs=['i = 23'])
+        self.expect("frame variable m", substrs=['j = 42'])
+        self.expect("expression s", substrs=['i = 23'])
+        self.expect("expression m", substrs=['j = 42'])
+        self.filecheck('platform shell cat "%s"' % log, __file__)
+        # CHECK: LogConfiguration
+        # CHECK-NOT: secret
+        # CHECK: Import 

lldb/test/API/lang/swift/explicit_modules/bridgingheader/bridging.h

@@ -0,0 +1,4 @@
+// A non-modular header.
+#include "secret.h"
+// A modular header.
+#include "M.h"