Looks reasonable. Thanks!<br><br>-eric<br><br><div>On Thu Jan 09 2014 at 5:45:16 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: dblaikie<br>
Date: Thu Jan 9 19:38:41 2014<br>
New Revision: 198908<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=198908&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=198908&view=rev</a><br>
Log:<br>
Revert "Revert r198851, "Prototype of skeleton type units for fission""<br>
<br>
This reverts commit r198865 which reverts r198851.<br>
<br>
ASan identified a use-of-uninitialized of the DwarfTypeUnit::Ty variable<br>
in skeleton type units.<br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.cpp<br>
llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.h<br>
llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfUnit.cpp<br>
llvm/trunk/lib/MC/<u></u>MCObjectFileInfo.cpp<br>
llvm/trunk/test/DebugInfo/X86/<u></u>generate-odr-hash.ll<br>
<br>
Modified: llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=198908&r1=198907&r2=198908&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>CodeGen/AsmPrinter/DwarfDebug.<u></u>cpp?rev=198908&r1=198907&r2=<u></u>198908&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.cpp Thu Jan 9 19:38:41 2014<br>
@@ -2976,6 +2976,22 @@ DwarfCompileUnit *DwarfDebug::constructS<br>
return NewCU;<br>
}<br>
<br>
+// This DIE has the following attributes: DW_AT_comp_dir, DW_AT_dwo_name,<br>
+// DW_AT_addr_base.<br>
+DwarfTypeUnit *DwarfDebug::<u></u>constructSkeletonTU(const DwarfTypeUnit *TU) {<br>
+<br>
+ DIE *Die = new DIE(dwarf::DW_TAG_type_unit);<br>
+ DwarfTypeUnit *NewTU = new DwarfTypeUnit(<br>
+ TU->getUniqueID(), Die, TU->getCUNode(), Asm, this, &SkeletonHolder);<br>
+ NewTU->setTypeSignature(TU-><u></u>getTypeSignature());<br>
+ NewTU->setType(NULL);<br>
+ NewTU->initSection(<br>
+ Asm->getObjFileLowering().<u></u>getDwarfTypesSection(TU-><u></u>getTypeSignature()));<br>
+<br>
+ initSkeletonUnit(TU, Die, NewTU);<br>
+ return NewTU;<br>
+}<br>
+<br>
// Emit the .debug_info.dwo section for separated dwarf. This contains the<br>
// compile units that would normally be in debug_info.<br>
void DwarfDebug::emitDebugInfoDWO() {<br>
@@ -3018,8 +3034,6 @@ void DwarfDebug::<u></u>addDwarfTypeUnitType(DI<br>
NewTU->addUInt(UnitDie, dwarf::DW_AT_language, dwarf::DW_FORM_data2,<br>
CUNode.getLanguage());<br>
<br>
- DIE *Die = NewTU->createTypeDIE(CTy);<br>
-<br>
MD5 Hash;<br>
Hash.update(Identifier);<br>
// ... take the least significant 8 bytes and return those. Our MD5<br>
@@ -3029,7 +3043,10 @@ void DwarfDebug::<u></u>addDwarfTypeUnitType(DI<br>
Hash.final(Result);<br>
uint64_t Signature = *reinterpret_cast<support::<u></u>ulittle64_t *>(Result + 8);<br>
NewTU->setTypeSignature(<u></u>Signature);<br>
- NewTU->setType(Die);<br>
+ if (useSplitDwarf())<br>
+ NewTU->setSkeleton(<u></u>constructSkeletonTU(NewTU));<br>
+<br>
+ NewTU->setType(NewTU-><u></u>createTypeDIE(CTy));<br>
<br>
NewTU->initSection(<br>
useSplitDwarf()<br>
<br>
Modified: llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=198908&r1=198907&r2=198908&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>CodeGen/AsmPrinter/DwarfDebug.<u></u>h?rev=198908&r1=198907&r2=<u></u>198908&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.h (original)<br>
+++ llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfDebug.h Thu Jan 9 19:38:41 2014<br>
@@ -596,6 +596,10 @@ class DwarfDebug : public AsmPrinterHand<br>
/// section.<br>
DwarfCompileUnit *constructSkeletonCU(const DwarfCompileUnit *CU);<br>
<br>
+ /// \brief Construct the split debug info compile unit for the debug info<br>
+ /// section.<br>
+ DwarfTypeUnit *constructSkeletonTU(const DwarfTypeUnit *TU);<br>
+<br>
/// \brief Emit the debug info dwo section.<br>
void emitDebugInfoDWO();<br>
<br>
<br>
Modified: llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=198908&r1=198907&r2=198908&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>CodeGen/AsmPrinter/DwarfUnit.<u></u>cpp?rev=198908&r1=198907&r2=<u></u>198908&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/<u></u>AsmPrinter/DwarfUnit.cpp Thu Jan 9 19:38:41 2014<br>
@@ -1987,7 +1987,9 @@ void DwarfTypeUnit::emitHeader(<u></u>const MCS<br>
Asm->OutStreamer.AddComment("<u></u>Type Signature");<br>
Asm->OutStreamer.EmitIntValue(<u></u>TypeSignature, sizeof(TypeSignature));<br>
Asm->OutStreamer.AddComment("<u></u>Type DIE Offset");<br>
- Asm->OutStreamer.EmitIntValue(<u></u>Ty->getOffset(), sizeof(Ty->getOffset()));<br>
+ // In a skeleton type unit there is no type DIE so emit a zero offset.<br>
+ Asm->OutStreamer.EmitIntValue(<u></u>Ty ? Ty->getOffset() : 0,<br>
+ sizeof(Ty->getOffset()));<br>
}<br>
<br>
void DwarfTypeUnit::initSection(<u></u>const MCSection *Section) {<br>
<br>
Modified: llvm/trunk/lib/MC/<u></u>MCObjectFileInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectFileInfo.cpp?rev=198908&r1=198907&r2=198908&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/MC/<u></u>MCObjectFileInfo.cpp?rev=<u></u>198908&r1=198907&r2=198908&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/MC/<u></u>MCObjectFileInfo.cpp (original)<br>
+++ llvm/trunk/lib/MC/<u></u>MCObjectFileInfo.cpp Thu Jan 9 19:38:41 2014<br>
@@ -726,8 +726,9 @@ const MCSection *MCObjectFileInfo::getDw<br>
<br>
const MCSection *<br>
MCObjectFileInfo::<u></u>getDwarfTypesDWOSection(<u></u>uint64_t Hash) const {<br>
- return Ctx->getELFSection(".debug_<u></u>types.dwo", ELF::SHT_GROUP, 0,<br>
- SectionKind::getMetadata(), 0, utostr(Hash));<br>
+ return Ctx->getELFSection(".debug_<u></u>types.dwo", ELF::SHT_PROGBITS,<br>
+ ELF::SHF_GROUP, SectionKind::getMetadata(), 0,<br>
+ utostr(Hash));<br>
}<br>
<br>
void MCObjectFileInfo::<u></u>InitEHFrameSection() {<br>
<br>
Modified: llvm/trunk/test/DebugInfo/X86/<u></u>generate-odr-hash.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/generate-odr-hash.ll?rev=198908&r1=198907&r2=198908&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/test/<u></u>DebugInfo/X86/generate-odr-<u></u>hash.ll?rev=198908&r1=198907&<u></u>r2=198908&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/test/DebugInfo/X86/<u></u>generate-odr-hash.ll (original)<br>
+++ llvm/trunk/test/DebugInfo/X86/<u></u>generate-odr-hash.ll Thu Jan 9 19:38:41 2014<br>
@@ -1,7 +1,10 @@<br>
; REQUIRES: object-emission<br>
<br>
; RUN: llc %s -o %t -filetype=obj -O0 -generate-type-units -mtriple=x86_64-unknown-linux-<u></u>gnu<br>
-; RUN: llvm-dwarfdump %t | FileCheck %s<br>
+; RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=SINGLE %s<br>
+<br>
+; RUN: llc %s -split-dwarf=Enable -o %t -filetype=obj -O0 -generate-type-units -mtriple=x86_64-unknown-linux-<u></u>gnu<br>
+; RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=FISSION %s<br>
<br>
; Generated from:<br>
; struct bar {};<br>
@@ -43,7 +46,8 @@<br>
<br>
; wombat wom;<br>
<br>
-; CHECK-LABEL: .debug_info contents:<br>
+; SINGLE-LABEL: .debug_info contents:<br>
+; FISSION-LABEL: .debug_info.dwo contents:<br>
; CHECK: Compile Unit: length = [[CU_SIZE:[0-9a-f]+]]<br>
<br>
; CHECK: DW_TAG_structure_type<br>
@@ -53,18 +57,32 @@<br>
<br>
; Ensure the CU-local type 'walrus' is not placed in a type unit.<br>
; CHECK: DW_TAG_structure_type<br>
-; CHECK-NEXT: debug_str{{.*}}"walrus"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"walrus"<br>
; CHECK-NEXT: DW_AT_byte_size<br>
; CHECK-NEXT: DW_AT_decl_file<br>
; CHECK-NEXT: DW_AT_decl_line<br>
<br>
-; CHECK-LABEL: .debug_types contents:<br>
+; FISSION-LABEL: .debug_types contents:<br>
+; FISSION-NOT: type_signature<br>
+; FISSION-LABEL: type_signature = 0x1d02f3be30cc5688<br>
+; FISSION: DW_TAG_type_unit<br>
+; FISSION: DW_AT_GNU_dwo_name{{.*}}"bar.<u></u>dwo"<br>
+; FISSION: DW_AT_comp_dir{{.*}}"/tmp/<u></u>dbginfo"<br>
+; FISSION-NOT: type_signature<br>
+; FISSION-LABEL: type_signature = 0xb04af47397402e77<br>
+; FISSION-NOT: type_signature<br>
+; FISSION-LABEL: type_signature = 0xfd756cee88f8a118<br>
+; FISSION-NOT: type_signature<br>
+; FISSION-LABEL: type_signature = 0xe94f6d3843e62d6b<br>
+<br>
+; SINGLE-LABEL: .debug_types contents:<br>
+; FISSION-LABEL: .debug_types.dwo contents:<br>
<br>
; Check that we generate a hash for bar and the value.<br>
; CHECK-NOT: type_signature<br>
; CHECK-LABEL: type_signature = 0x1d02f3be30cc5688<br>
; CHECK: DW_TAG_structure_type<br>
-; CHECK-NEXT: debug_str{{.*}}"bar"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"bar"<br>
<br>
<br>
; Check that we generate a hash for fluffy and the value.<br>
@@ -72,13 +90,13 @@<br>
; CHECK-LABEL: type_signature = 0xb04af47397402e77<br>
; CHECK-NOT: DW_AT_GNU_odr_signature [DW_FORM_data8] (0x9a0124d5a0c21c52)<br>
; CHECK: DW_TAG_namespace<br>
-; CHECK-NEXT: debug_str{{.*}}"echidna"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"echidna"<br>
; CHECK: DW_TAG_namespace<br>
-; CHECK-NEXT: debug_str{{.*}}"capybara"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"capybara"<br>
; CHECK: DW_TAG_namespace<br>
-; CHECK-NEXT: debug_str{{.*}}"mongoose"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"mongoose"<br>
; CHECK: DW_TAG_class_type<br>
-; CHECK-NEXT: debug_str{{.*}}"fluffy"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"fluffy"<br>
<br>
; Check that we generate a hash for wombat and the value, but not for the<br>
; anonymous type contained within.<br>
@@ -86,7 +104,7 @@<br>
; CHECK-LABEL: type_signature = 0xfd756cee88f8a118<br>
; CHECK-NOT: DW_AT_GNU_odr_signature [DW_FORM_data8] (0x685bcc220141e9d7)<br>
; CHECK: DW_TAG_structure_type<br>
-; CHECK-NEXT: debug_str{{.*}}"wombat"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"wombat"<br>
<br>
; CHECK-NOT: type_signature<br>
; CHECK-LABEL: type_signature = 0xe94f6d3843e62d6b<br>
@@ -100,7 +118,7 @@<br>
; CHECK-NOT: DW_AT_name<br>
; CHECK-NOT: DW_AT_GNU_odr_signature<br>
; CHECK: DW_TAG_member<br>
-; CHECK-NEXT: debug_str{{.*}}"a"<br>
+; CHECK-NEXT: DW_AT_name{{.*}}"a"<br>
<br>
; Use the unit size as a rough hash/identifier for the unit we're dealing with<br>
; it happens to be unambiguous at the moment, but it's hardly ideal.<br>
@@ -110,17 +128,21 @@<br>
; CHECK-NEXT: Offset Name<br>
; CHECK-NEXT: "walrus"<br>
; Type unit for 'bar'<br>
-; CHECK-NEXT: unit_size = 0x00000023<br>
+; SINGLE-NEXT: unit_size = 0x00000023<br>
+; FISSION-NEXT: unit_size = 0x00000024<br>
; CHECK-NEXT: Offset Name<br>
; CHECK-NEXT: "bar"<br>
-; CHECK-NEXT: unit_size = 0x0000005d<br>
+; SINGLE-NEXT: unit_size = 0x0000005d<br>
+; FISSION-NEXT: unit_size = 0x00000024<br>
; CHECK-NEXT: Offset Name<br>
; CHECK-NEXT: "int"<br>
; CHECK-NEXT: "echidna::capybara::mongoose::<u></u>fluffy"<br>
-; CHECK-NEXT: unit_size = 0x0000003a<br>
+; SINGLE-NEXT: unit_size = 0x0000003a<br>
+; FISSION-NEXT: unit_size = 0x00000024<br>
; CHECK-NEXT: Offset Name<br>
; CHECK-NEXT: "wombat"<br>
-; CHECK-NEXT: unit_size = 0x0000004b<br>
+; SINGLE-NEXT: unit_size = 0x0000004b<br>
+; FISSION-NEXT: unit_size = 0x00000024<br>
; CHECK-NEXT: Offset Name<br>
; CHECK-NEXT: "int"<br>
<br>
@@ -179,7 +201,7 @@ attributes #1 = { nounwind readnone }<br>
!llvm.module.flags = !{!42, !54}<br>
!llvm.ident = !{!43}<br>
<br>
-!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !20, metadata !37, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/bar.cpp] [DW_LANG_C_plus_plus]<br>
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !20, metadata !37, metadata !2, metadata !"bar.dwo"} ; [ DW_TAG_compile_unit ] [/tmp/dbginfo/bar.cpp] [DW_LANG_C_plus_plus]<br>
!1 = metadata !{metadata !"bar.cpp", metadata !"/tmp/dbginfo"}<br>
!2 = metadata !{i32 0}<br>
!3 = metadata !{metadata !4, metadata !5, metadata !13, metadata !16}<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote>