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