[llvm] r203867 - Use DW_AT_linkage_name when we're emitting DWARF4 or above.

[Eric Christopher]

Author: echristo
Date: Thu Mar 13 18:26:25 2014
New Revision: 203867

URL: http://llvm.org/viewvc/llvm-project?rev=203867&view=rev
Log:
Use DW_AT_linkage_name when we're emitting DWARF4 or above.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
    llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=203867&r1=203866&r2=203867&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Thu Mar 13 18:26:25 2014
@@ -1651,7 +1651,8 @@ void DwarfCompileUnit::createGlobalVaria
       // TAG_variable.
       addString(IsStaticMember && VariableSpecDIE ? VariableSpecDIE
                                                   : VariableDIE,
-                dwarf::DW_AT_MIPS_linkage_name,
+                DD->getDwarfVersion() >= 4 ? dwarf::DW_AT_linkage_name
+                                           : dwarf::DW_AT_MIPS_linkage_name,
                 GlobalValue::getRealLinkageName(LinkageName));
   } else if (const ConstantInt *CI =
                  dyn_cast_or_null<ConstantInt>(GV.getConstant())) {

Modified: llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll?rev=203867&r1=203866&r2=203867&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll (original)
+++ llvm/trunk/test/DebugInfo/X86/debug-info-static-member.ll Thu Mar 13 18:26:25 2014
@@ -1,7 +1,7 @@
-; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-unknown-linux-gnu
+; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-unknown-linux-gnu -dwarf-version=4
 ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=PRESENT
 ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=ABSENT
-; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-apple-darwin
+; RUN: llc %s -o %t -filetype=obj -O0 -mtriple=x86_64-apple-darwin -dwarf-version=4
 ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=DARWINP
 ; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s -check-prefix=DARWINA
 ; Verify that attributes we do want are PRESENT;
@@ -133,15 +133,15 @@ declare void @llvm.dbg.declare(metadata,
 ; PRESENT:      DW_TAG_variable
 ; PRESENT-NEXT: DW_AT_specification {{.*}} {0x[[DECL_A]]}
 ; PRESENT-NEXT: DW_AT_location
-; PRESENT-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1aE"
+; PRESENT-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1aE"
 ; PRESENT:      DW_TAG_variable
 ; PRESENT-NEXT: DW_AT_specification {{.*}} {0x[[DECL_B]]}
 ; PRESENT-NEXT: DW_AT_location
-; PRESENT-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1bE"
+; PRESENT-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1bE"
 ; PRESENT:      DW_TAG_variable
 ; PRESENT-NEXT: DW_AT_specification {{.*}} {0x[[DECL_C]]}
 ; PRESENT-NEXT: DW_AT_location
-; PRESENT-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1cE"
+; PRESENT-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1cE"
 
 ; For Darwin gdb:
 ; DARWINP:      .debug_info contents:
@@ -183,19 +183,19 @@ declare void @llvm.dbg.declare(metadata,
 ; DARWINP:      DW_TAG_variable
 ; DARWINP-NEXT: DW_AT_specification {{.*}} {0x[[DECL_A]]}
 ; DARWINP-NEXT: DW_AT_location
-; DARWINP-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1aE"
+; DARWINP-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1aE"
 ; DARWINP:      DW_TAG_variable
 ; DARWINP-NEXT: DW_AT_specification {{.*}} {0x[[DECL_B]]}
 ; DARWINP-NEXT: DW_AT_location
-; DARWINP-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1bE"
+; DARWINP-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1bE"
 ; DARWINP:      DW_TAG_variable
 ; DARWINP-NEXT: DW_AT_specification {{.*}} {0x[[DECL_C]]}
 ; DARWINP-NEXT: DW_AT_location
-; DARWINP-NEXT: DW_AT_MIPS_linkage_name {{.*}} "_ZN1C1cE"
+; DARWINP-NEXT: DW_AT_linkage_name {{.*}} "_ZN1C1cE"
 
 ; ABSENT verifies that static member declarations do not have either
 ; DW_AT_location or DW_AT_data_member_location; also, variables do not
-; have DW_AT_const_value and constants do not have DW_AT_MIPS_linkage_name.
+; have DW_AT_const_value and constants do not have DW_AT_linkage_name.
 ;
 ; ABSENT:      .debug_info contents:
 ; ABSENT:      DW_TAG_member
@@ -203,24 +203,24 @@ declare void @llvm.dbg.declare(metadata,
 ; ABSENT-NOT:  DW_AT_const_value
 ; ABSENT-NOT:  location
 ; ABSENT:      DW_AT_name {{.*}} "const_a"
-; ABSENT-NOT:  DW_AT_MIPS_linkage_name
+; ABSENT-NOT:  DW_AT_linkage_name
 ; ABSENT-NOT:  location
 ; ABSENT:      DW_AT_name {{.*}} "b"
 ; ABSENT-NOT:  DW_AT_const_value
 ; ABSENT-NOT:  location
 ; ABSENT:      DW_AT_name {{.*}} "const_b"
-; ABSENT-NOT:  DW_AT_MIPS_linkage_name
+; ABSENT-NOT:  DW_AT_linkage_name
 ; ABSENT-NOT:  location
 ; ABSENT:      DW_AT_name {{.*}} "c"
 ; ABSENT-NOT:  DW_AT_const_value
 ; ABSENT-NOT:  location
 ; ABSENT:      DW_AT_name {{.*}} "const_c"
-; ABSENT-NOT:  DW_AT_MIPS_linkage_name
+; ABSENT-NOT:  DW_AT_linkage_name
 ; ABSENT-NOT:  location
 ; While we're here, a normal member does not have a linkage name, constant
 ; value, or DW_AT_location.
 ; ABSENT:      DW_AT_name {{.*}} "d"
-; ABSENT-NOT:  DW_AT_MIPS_linkage_name
+; ABSENT-NOT:  DW_AT_linkage_name
 ; ABSENT-NOT:  DW_AT_const_value
 ; ABSENT-NOT:  DW_AT_location
 ; ABSENT:      NULL
@@ -232,24 +232,24 @@ declare void @llvm.dbg.declare(metadata,
 ; DARWINA-NOT:  DW_AT_const_value
 ; DARWINA-NOT:  location
 ; DARWINA:      DW_AT_name {{.*}} "const_a"
-; DARWINA-NOT:  DW_AT_MIPS_linkage_name
+; DARWINA-NOT:  DW_AT_linkage_name
 ; DARWINA-NOT:  location
 ; DARWINA:      DW_AT_name {{.*}} "b"
 ; DARWINA-NOT:  DW_AT_const_value
 ; DARWINA-NOT:  location
 ; DARWINA:      DW_AT_name {{.*}} "const_b"
-; DARWINA-NOT:  DW_AT_MIPS_linkage_name
+; DARWINA-NOT:  DW_AT_linkage_name
 ; DARWINA-NOT:  location
 ; DARWINA:      DW_AT_name {{.*}} "c"
 ; DARWINA-NOT:  DW_AT_const_value
 ; DARWINA-NOT:  location
 ; DARWINA:      DW_AT_name {{.*}} "const_c"
-; DARWINA-NOT:  DW_AT_MIPS_linkage_name
+; DARWINA-NOT:  DW_AT_linkage_name
 ; DARWINA-NOT:  location
 ; While we're here, a normal member does not have a linkage name, constant
 ; value, or DW_AT_location.
 ; DARWINA:      DW_AT_name {{.*}} "d"
-; DARWINA-NOT:  DW_AT_MIPS_linkage_name
+; DARWINA-NOT:  DW_AT_linkage_name
 ; DARWINA-NOT:  DW_AT_const_value
 ; DARWINA-NOT:  DW_AT_location
 ; DARWINA:      NULL