DO NOT MERGE: debug CI failure

hnrklssn · hnrklssn · commit 7c794aa7b950 · 2025-06-07T14:55:44.000-07:00
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -2290,9 +2290,13 @@ ClangImporter::Implementation::lookupModule(StringRef moduleName) {
   return loadFromMM();
 }
 
+#define DEBUG_TYPE "foo"
 ModuleDecl *ClangImporter::Implementation::loadModuleClang(
     SourceLoc importLoc, ImportPath::Module path) {
   auto realModuleName = SwiftContext.getRealModuleName(path.front().Item).str();
+  LLVM_DEBUG(llvm::dbgs() << "loadModuleClang '";
+  path.print(llvm::dbgs());
+  llvm::dbgs() << "'\n");
 
   // Convert the Swift import path over to a Clang import path.
   SmallVector<std::pair<clang::IdentifierInfo *, clang::SourceLocation>, 4>
@@ -2331,9 +2335,19 @@ ModuleDecl *ClangImporter::Implementation::loadModuleClang(
     }
 
     clang::SourceLocation clangImportLoc = getNextIncludeLoc();
+    LLVM_DEBUG(
+      llvm::dbgs() << "loading clang module '";
+      llvm::interleave(path, [](auto IdInfoPair) { llvm::dbgs() << IdInfoPair.first->getName(); },
+                             []() { llvm::dbgs() << "."; });
+      llvm::dbgs() << "'\n");
     clang::ModuleLoadResult result =
         Instance->loadModule(clangImportLoc, path, visibility,
                              /*IsInclusionDirective=*/false);
+    LLVM_DEBUG(
+      llvm::dbgs() << "loaded clang module '";
+      llvm::interleave(path, [](auto IdInfoPair) { llvm::dbgs() << IdInfoPair.first->getName(); },
+                             []() { llvm::dbgs() << "."; });
+      llvm::dbgs() << "'\n");
 
     if (!preservedIndexStorePathOption.empty()) {
       // Restore the -index-store-path option.
@@ -2395,9 +2409,10 @@ ClangImporter::loadModule(SourceLoc importLoc,
 }
 
 ModuleDecl *ClangImporter::Implementation::loadModule(
-    SourceLoc importLoc, ImportPath::Module path) {
+    SourceLoc importLoc, ImportPath::Module path, const std::string caller) {
   ModuleDecl *MD = nullptr;
   ASTContext &ctx = getNameImporter().getContext();
+  LLVM_DEBUG(llvm::dbgs() << "loadModule called from " << caller << "\n");
 
   // `CxxStdlib` is the only accepted spelling of the C++ stdlib module name.
   if (path.front().Item.is("std") ||
@@ -2419,6 +2434,7 @@ ModuleDecl *ClangImporter::Implementation::loadModule(
 ModuleDecl *ClangImporter::Implementation::finishLoadingClangModule(
     const clang::Module *clangModule, SourceLoc importLoc) {
   assert(clangModule);
+  LLVM_DEBUG(llvm::dbgs() << "finishLoadingClangModule\n");
 
   // Bump the generation count.
   bumpGeneration();
@@ -2464,6 +2480,7 @@ ModuleDecl *ClangImporter::Implementation::finishLoadingClangModule(
       SwiftContext.addLoadedModule(result);
   }
 
+  LLVM_DEBUG(llvm::dbgs() << "finished loading clang module\n");
   return result;
 }
 
diff --git a/lib/ClangImporter/ImporterImpl.h b/lib/ClangImporter/ImporterImpl.h
@@ -882,7 +882,7 @@ class LLVM_LIBRARY_VISIBILITY ClangImporter::Implementation
 public:
   /// Load a module using either method.
   ModuleDecl *loadModule(SourceLoc importLoc,
-                         ImportPath::Module path);
+                         ImportPath::Module path, const std::string caller = __func__);
 
   void recordImplicitUnwrapForDecl(ValueDecl *decl, bool isIUO) {
     if (!isIUO)
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -3054,9 +3054,10 @@ ModuleDecl *ModuleFile::getModule(ModuleID MID) {
 }
 
 ModuleDecl *ModuleFile::getModule(ImportPath::Module name,
-                                  bool allowLoading) {
+                                  bool allowLoading, const std::string caller) {
   if (name.empty() || name.front().Item.empty())
     return getContext().TheBuiltinModule;
+  DEBUG_WITH_TYPE("foo", llvm::dbgs() << "getModule called from " << caller << "\n");
 
   // FIXME: duplicated from ImportResolver::getModule
   Identifier parentName = FileContext->getParentModule()->getName();
diff --git a/lib/Serialization/DeserializationErrors.h b/lib/Serialization/DeserializationErrors.h
@@ -725,19 +725,31 @@ class InavalidAvailabilityDomainError
   }
 };
 
+#define DEBUG_TYPE "foo"
+
 class PrettyStackTraceModuleFile : public llvm::PrettyStackTraceEntry {
   const char *Action;
   const ModuleFile &MF;
+  const std::string caller;
 public:
-  explicit PrettyStackTraceModuleFile(const char *action, ModuleFile &module)
-      : Action(action), MF(module) {}
-  explicit PrettyStackTraceModuleFile(ModuleFile &module)
-      : PrettyStackTraceModuleFile("While reading from", module) {}
+  explicit PrettyStackTraceModuleFile(const char *action, ModuleFile &module, std::string c = __func__)
+      : Action(action), MF(module), caller(c) {
+        LLVM_DEBUG(llvm::dbgs() << "start module read of ";
+        MF.outputDiagnosticInfo(llvm::dbgs());
+        llvm::dbgs() << " (called from " << c << ")\n");
+      }
+  explicit PrettyStackTraceModuleFile(ModuleFile &module, std::string caller = __func__)
+      : PrettyStackTraceModuleFile("While reading from", module, caller) {}
 
+  ~PrettyStackTraceModuleFile() {
+    LLVM_DEBUG(llvm::dbgs() << "finish module read of ";
+    MF.outputDiagnosticInfo(llvm::dbgs());
+    llvm::dbgs() << " (called from " << caller << ")\n");
+  }
   void print(raw_ostream &os) const override {
     os << Action << " ";
     MF.outputDiagnosticInfo(os);
-    os << "\n";
+    os << " (called from " << caller << ")\n";
   }
 };
 
diff --git a/lib/Serialization/ModuleFile.h b/lib/Serialization/ModuleFile.h
@@ -1058,7 +1058,7 @@ class ModuleFile
   ///
   /// If the name matches the name of the current module, a shadowed module
   /// is loaded instead.
-  ModuleDecl *getModule(ImportPath::Module name, bool allowLoading = false);
+  ModuleDecl *getModule(ImportPath::Module name, bool allowLoading = false, std::string caller = __func__);
 
   /// Returns the generic signature for the given ID.
   GenericSignature getGenericSignature(serialization::GenericSignatureID ID);
diff --git a/test/Interop/Cxx/stdlib/std-span-interface.swift b/test/Interop/Cxx/stdlib/std-span-interface.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -plugin-path %swift-plugin-dir -I %S/Inputs -enable-experimental-feature SafeInteropWrappers -print-module -module-to-print=StdSpan -source-filename=x -enable-experimental-cxx-interop -Xcc -std=c++20 -module-cache-path %t > %t/interface.swift
+// RUN: %target-swift-ide-test -plugin-path %swift-plugin-dir -Xllvm -debug-only=foo -I %S/Inputs -enable-experimental-feature SafeInteropWrappers -print-module -module-to-print=StdSpan -source-filename=x -enable-experimental-cxx-interop -Xcc -std=c++20 -module-cache-path %t > %t/interface.swift
 // RUN: %FileCheck %s < %t/interface.swift
 
 // Make sure we trigger typechecking and SIL diagnostics
