From fab3e599b0a6a22b3f9efee3aa5121f17239f8b6 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 2 Dec 2013 18:44:29 +0000 Subject: [PATCH] DebugInfo: Type Units: Propagate the correct DW_AT_language into type units. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196130 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 2 +- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 10 ++++---- lib/CodeGen/AsmPrinter/DwarfDebug.h | 2 +- test/DebugInfo/X86/c-type-units.ll | 28 +++++++++++++++++++++ 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 test/DebugInfo/X86/c-type-units.ll diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index e6b3331cf62..48003c06ebe 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -989,7 +989,7 @@ DIE *CompileUnit::getOrCreateTypeDIE(const MDNode *TyNode) { else if (Ty.isCompositeType()) { DICompositeType CTy(Ty); if (shouldCreateTypeUnit(CTy, DD)) { - DD->addTypeUnitType(TyDIE, CTy); + DD->addTypeUnitType(getLanguage(), TyDIE, CTy); // Skip updating the accellerator tables since this is not the full type return TyDIE; } diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 33bd6f27ba3..9eab090e47d 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -3055,7 +3055,8 @@ void DwarfDebug::emitDebugStrDWO() { OffSec, StrSym); } -void DwarfDebug::addTypeUnitType(DIE *RefDie, DICompositeType CTy) { +void DwarfDebug::addTypeUnitType(uint16_t Language, DIE *RefDie, + DICompositeType CTy) { DenseMap *> >::iterator I = TypeUnits.find(CTy); @@ -3068,12 +3069,11 @@ void DwarfDebug::addTypeUnitType(DIE *RefDie, DICompositeType CTy) { } } else { DIE *UnitDie = new DIE(dwarf::DW_TAG_type_unit); - CompileUnit *NewCU = - new CompileUnit(GlobalCUIndexCount++, UnitDie, - dwarf::DW_LANG_C_plus_plus, Asm, this, &InfoHolder); + CompileUnit *NewCU = new CompileUnit(GlobalCUIndexCount++, UnitDie, + Language, Asm, this, &InfoHolder); CUDieMap.insert(std::make_pair(UnitDie, NewCU)); NewCU->addUInt(UnitDie, dwarf::DW_AT_language, dwarf::DW_FORM_data2, - dwarf::DW_LANG_C_plus_plus); + Language); // Register the type in the TypeUnits map with a vector of references to be // populated whenever a reference is required. diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h index c42a3f1a742..c334770fafa 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.h +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h @@ -704,7 +704,7 @@ public: /// \brief Add a DIE to the set of types that we're going to pull into /// type units. - void addTypeUnitType(DIE *Die, DICompositeType CTy); + void addTypeUnitType(uint16_t Language, DIE *Die, DICompositeType CTy); /// \brief Add a label so that arange data can be generated for it. void addArangeLabel(SymbolCU SCU) { ArangeLabels.push_back(SCU); } diff --git a/test/DebugInfo/X86/c-type-units.ll b/test/DebugInfo/X86/c-type-units.ll new file mode 100644 index 00000000000..7fbbf7a3f02 --- /dev/null +++ b/test/DebugInfo/X86/c-type-units.ll @@ -0,0 +1,28 @@ +; REQUIRES: object-emission + +; RUN: llc -o - %s -filetype=obj -O0 -generate-type-units -mtriple=x86_64-unknown-linux-gnu | llvm-dwarfdump -debug-dump=info - | FileCheck %s + +; struct foo { +; } f; + +; CHECK: DW_TAG_type_unit +; CHECK-NEXT: DW_AT_language [DW_FORM_data2] (0x000c) + +%struct.foo = type {} + +@f = common global %struct.foo zeroinitializer, align 1 + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!7, !8} +!llvm.ident = !{!9} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !2, metadata !3, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/simple.c] [DW_LANG_C99] +!1 = metadata !{metadata !"simple.c", metadata !"/tmp/dbginfo"} +!2 = metadata !{i32 0} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786484, i32 0, null, metadata !"f", metadata !"f", metadata !"", metadata !5, i32 2, metadata !6, i32 0, i32 1, %struct.foo* @f, null} ; [ DW_TAG_variable ] [f] [line 2] [def] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/tmp/dbginfo/simple.c] +!6 = metadata !{i32 786451, metadata !1, null, metadata !"foo", i32 1, i64 0, i64 8, i32 0, i32 0, null, metadata !2, i32 0, null, null, null} ; [ DW_TAG_structure_type ] [foo] [line 1, size 0, align 8, offset 0] [def] [from ] +!7 = metadata !{i32 2, metadata !"Dwarf Version", i32 4} +!8 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!9 = metadata !{metadata !"clang version 3.5 "}