Merge pull request #63358 from adrian-prantl/104894694

Wire up mangled macro names in debug info.

Author: swift-ci

lib/IRGen/IRGenDebugInfo.cpp

@@ -567,6 +567,9 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     if (L.isASTNode<DestructorDecl>())
       return "deinit";
 
+    if (ValueDecl *D = L.getAsASTNode<ValueDecl>())
+      return D->getBaseIdentifier().str();
+
     return StringRef();
   }
 

lib/SILGen/SILGenExpr.cpp

@@ -6035,8 +6035,11 @@ RValue RValueEmitter::visitMacroExpansionExpr(MacroExpansionExpr *E,
                                               SGFContext C) {
   auto *rewritten = E->getRewritten();
   assert(rewritten && "Macro should have been rewritten by SILGen");
-  MacroScope scope(SGF, CleanupLocation(rewritten), E, E->getMacroName(),
-                   E->getMacroNameLoc());
+  Mangle::ASTMangler mangler;
+  auto name =
+      SGF.getASTContext().getIdentifier(mangler.mangleMacroExpansion(E));
+  MacroScope scope(SGF, CleanupLocation(rewritten), E, name.str(),
+                   E->getMacroRef().getDecl());
   return visit(rewritten, C);
 }
 

lib/SILGen/SILGenFunction.cpp

@@ -163,16 +163,16 @@ DeclName SILGenModule::getMagicFunctionName(SILDeclRef ref) {
 
 void SILGenFunction::enterDebugScope(SILLocation Loc, bool isBindingScope,
                                      Optional<SILLocation> MacroExpansion,
-                                     DeclNameRef MacroName,
-                                     DeclNameLoc MacroNameLoc) {
+                                     StringRef MacroName,
+                                     Optional<SILLocation> MacroLoc) {
   auto *Parent = DebugScopeStack.size() ? DebugScopeStack.back().getPointer()
                                         : F.getDebugScope();
   auto *Scope = Parent;
   // Don't nest a scope for Loc under Parent unless it's actually different.
   if (RegularLocation(Parent->getLoc()) != RegularLocation(Loc)) {
     SILDebugScope *InlinedAt = nullptr;
     // Create an inline scope for a macro expansion.
-    if (MacroExpansion && MacroName && MacroNameLoc.isValid()) {
+    if (MacroExpansion && !MacroName.empty() && MacroLoc) {
       InlinedAt = new (SGM.M) SILDebugScope(RegularLocation(*MacroExpansion),
                                             &getFunction(), Parent);
       SILGenFunctionBuilder B(SGM);
@@ -183,10 +183,9 @@ void SILGenFunction::enterDebugScope(SILLocation Loc, bool isBindingScope,
           /*Results*/ {}, None, SubstitutionMap(), SubstitutionMap(),
           SGM.M.getASTContext());
       SILFunction *MacroFn = B.getOrCreateFunction(
-          Loc, MacroName.getBaseIdentifier().str(),
-          SILLinkage::DefaultForDeclaration, FunctionType, IsNotBare,
-          IsNotTransparent, IsNotSerialized, IsNotDynamic, IsNotDistributed,
-          IsNotRuntimeAccessible);
+          *MacroLoc, MacroName, SILLinkage::DefaultForDeclaration, FunctionType,
+          IsNotBare, IsNotTransparent, IsNotSerialized, IsNotDynamic,
+          IsNotDistributed, IsNotRuntimeAccessible);
       auto MacroScope = new (SGM.M) SILDebugScope(Loc, MacroFn);
       Parent = MacroScope;
     }

lib/SILGen/SILGenFunction.h

@@ -614,8 +614,8 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// ends.
   void enterDebugScope(SILLocation Loc, bool isBindingScope = false,
                        Optional<SILLocation> MacroExpansion = {},
-                       DeclNameRef MacroName = {},
-                       DeclNameLoc MacroNameLoc = {});
+                       StringRef MacroName = {},
+                       Optional<SILLocation> MacroLoc = {});
 
   /// Return to the previous debug scope.
   void leaveDebugScope();

lib/SILGen/Scope.h

@@ -167,8 +167,8 @@ class LLVM_LIBRARY_VISIBILITY MacroScope {
 
 public:
   explicit MacroScope(SILGenFunction &SGF, CleanupLocation loc,
-                      SILLocation MacroExpansion, DeclNameRef MacroName,
-                      DeclNameLoc MacroNameLoc)
+                      SILLocation MacroExpansion, StringRef MacroName,
+                      SILLocation MacroNameLoc)
       : SGF(SGF) {
     SGF.enterDebugScope(loc, false, MacroExpansion, MacroName, MacroNameLoc);
   }

test/Macros/macro_expand.swift

@@ -13,7 +13,8 @@
 // Debug info SIL testing
 // RUN: %target-swift-frontend -emit-sil -enable-experimental-feature Macros -enable-experimental-feature Macros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - -g | %FileCheck --check-prefix CHECK-SIL %s
 
-// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature Macros -enable-experimental-feature Macros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - -g | %FileCheck --check-prefix CHECK-SIL %s
+// Debug info IR testing
+// RUN: %target-swift-frontend -emit-ir -enable-experimental-feature Macros -enable-experimental-feature Macros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -module-name MacroUser -o - -g | %FileCheck --check-prefix CHECK-IR %s
 
 // Execution testing
 // RUN: %target-build-swift -g -enable-experimental-feature Macros -enable-experimental-feature Macros -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir -L %swift-host-lib-dir %s -o %t/main -module-name MacroUser
@@ -31,9 +32,10 @@
 func testFileID(a: Int, b: Int) {
   // CHECK: MacroUser/macro_expand.swift
   print("Result is \(#customFileID)")
-  // CHECK-SIL: sil_scope [[MACRO_SCOPE:[0-9]+]] { loc "{{.*}}":1:1 parent @customFileID {{.*}} }
+  // CHECK-SIL: sil_scope [[MACRO_SCOPE:[0-9]+]] { loc "{{.*}}":1:1 parent @$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_ {{.*}} }
   // CHECK-SIL: sil_scope [[SRC_SCOPE:[0-9]+]] { loc "{{.*}}macro_expand.swift":[[@LINE-2]]
   // CHECK-SIL: sil_scope {{[0-9]+}} { loc "{{.*}}":1:1 parent [[MACRO_SCOPE]] inlined_at [[SRC_SCOPE]] }
+  // CHECK-IR: !DISubprogram(name: "customFileID", linkageName: "$s9MacroUser10testFileID1a1bySi_SitF06customdE0fMf_"
 
 
   // CHECK: Builtin result is MacroUser/macro_expand.swift