fixup! add clang driver option

Author: Michael137

clang/include/clang/Basic/DebugOptions.def

@@ -125,8 +125,11 @@ DEBUGOPT(DebugNameTable, 2, 0, Compatible)
 /// Whether to use DWARF base address specifiers in .debug_ranges.
 DEBUGOPT(DebugRangesBaseAddress, 1, 0, Compatible)
 
+/// Whether to add linkage names to constructor/destructor declarations.
+DEBUGOPT(DebugStructorDeclLinkageNames, 1, 0, Benign)
+
 /// Whether to embed source in DWARF debug line section.
-DEBUGOPT(EmbedSource, 1, 0, Compatible)
+DEBUGOPT(EmbedSource, 1, 1, Compatible)
 
 #undef DEBUGOPT
 #undef ENUM_DEBUGOPT

clang/include/clang/Driver/Options.td

@@ -4767,6 +4767,15 @@ def gembed_source : Flag<["-"], "gembed-source">, Group<g_flags_Group>,
 def gno_embed_source : Flag<["-"], "gno-embed-source">, Group<g_flags_Group>,
     Flags<[NoXarchOption]>,
     HelpText<"Restore the default behavior of not embedding source text in DWARF debug sections">;
+defm structor_decl_linkage_names
+    : BoolGOption<"structor-decl-linkage-names",
+                  CodeGenOpts<"DebugStructorDeclLinkageNames">, DefaultTrue,
+                  NegFlag<SetFalse>,
+                  PosFlag<SetTrue, [], [],
+                          "Attach linkage names to C++ constructor/destructor "
+                          "declarations in DWARF."
+                          "Implies -g.">,
+                  BothFlags<[], [ClangOption, CLOption, CC1Option]>>;
 defm key_instructions : BoolGOption<"key-instructions",
     CodeGenOpts<"DebugKeyInstructions">, DefaultFalse,
     NegFlag<SetFalse>, PosFlag<SetTrue, [], [],

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -2181,9 +2181,12 @@ llvm::StringRef
 CGDebugInfo::GetMethodLinkageName(const CXXMethodDecl *Method) const {
   assert(Method);
 
-  bool IsCtorOrDtor =
+  const bool IsCtorOrDtor =
       isa<CXXConstructorDecl>(Method) || isa<CXXDestructorDecl>(Method);
 
+  if (IsCtorOrDtor && !CGM.getCodeGenOpts().DebugStructorDeclLinkageNames)
+    return {};
+
   // In some ABIs (particularly Itanium) a single ctor/dtor
   // corresponds to multiple functions. Attach a "unified"
   // linkage name for those (which is the convention GCC uses).

clang/lib/Driver/ToolChains/Clang.cpp

@@ -4595,6 +4595,10 @@ renderDebugOptions(const ToolChain &TC, const Driver &D, const llvm::Triple &T,
                    options::OPT_gno_key_instructions, false))
     CmdArgs.push_back("-gkey-instructions");
 
+  if (!Args.hasFlag(options::OPT_gstructor_decl_linkage_names,
+                    options::OPT_gno_structor_decl_linkage_names, true))
+    CmdArgs.push_back("-gno-structor-decl-linkage-names");
+
   if (EmitCodeView) {
     CmdArgs.push_back("-gcodeview");
 

clang/test/CodeGenCXX/debug-info-structor-linkage-names.cpp

@@ -1,8 +1,21 @@
 // Tests that we emit unified constructor/destructor linkage names
 // for ABIs that support it.
 
-// RUN: %clang_cc1 -triple aarch64-apple-macosx -emit-llvm -debug-info-kind=standalone %s -o - | FileCheck %s --check-prefixes=CHECK,ITANIUM
-// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm -debug-info-kind=standalone %s -o - | FileCheck %s --check-prefixes=CHECK,MSABI
+// Check that -gstructor-decl-linkage-names is the default.
+// RUN: %clang_cc1 -triple aarch64-apple-macosx -emit-llvm -debug-info-kind=standalone \
+// RUN:            %s -o - | FileCheck %s --check-prefixes=CHECK,ITANIUM
+//
+// Check with -gstructor-decl-linkage-names.
+// RUN: %clang_cc1 -triple aarch64-apple-macosx -emit-llvm -debug-info-kind=standalone \
+// RUN:            -gstructor-decl-linkage-names %s -o - | FileCheck %s --check-prefixes=CHECK,ITANIUM
+//
+// Check with -gno-structor-decl-linkage-names.
+// RUN: %clang_cc1 -triple aarch64-apple-macosx -emit-llvm -debug-info-kind=standalone \
+// RUN:            -gno-structor-decl-linkage-names %s -o - | FileCheck %s --check-prefixes=CHECK,DISABLE
+//
+// Check ABI without structor variants.
+// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm -debug-info-kind=standalone \
+// RUN:            -gstructor-decl-linkage-names %s -o - | FileCheck %s --check-prefixes=CHECK,MSABI
 
 struct Base {
   Base(int x);
@@ -16,11 +29,13 @@ Base::~Base() {}
 
 // CHECK: ![[BASE_CTOR_DECL:[0-9]+]] = !DISubprogram(name: "Base"
 // MSABI-NOT:                                        linkageName:
+// DISABLE-NOT:                                      linkageName:
 // ITANIUM-SAME:                                     linkageName: "_ZN4BaseC4Ei"
 // CHECK-SAME:                                       spFlags: 0
 
 // CHECK: ![[BASE_DTOR_DECL:[0-9]+]] = !DISubprogram(name: "~Base"
 // MSABI-NOT:                                        linkageName:
+// DISABLE-NOT:                                      linkageName:
 // ITANIUM-SAME:                                     linkageName: "_ZN4BaseD4Ev"
 // CHECK-SAME:                                       spFlags: 0
 
@@ -61,6 +76,7 @@ struct Derived : public Base {
 
 // CHECK: [[BASE_INHERIT_CTOR_DECL]] = !DISubprogram(name: "Base"
 // MSABI-NOT:                                        linkageName:
+// DISABLE-NOT:                                      linkageName:
 // ITANIUM-SAME:                                     linkageName: "_ZN7DerivedCI44BaseEi"
 // CHECK-SAME                                        spFlags: 0