[clang] d82b6ba - Revert "[DWARF5] Start emitting DW_AT_dwo_name when -gdwarf-5 is specified."
Eric Christopher via cfe-commits
cfe-commits at lists.llvm.org
Tue Dec 10 11:53:51 PST 2019
You don't need to revert for a missing differential revision, just close
the revision yourself :)
-eric
On Tue, Dec 10, 2019 at 11:51 AM Sourabh Singh Tomar via cfe-commits <
cfe-commits at lists.llvm.org> wrote:
>
> Author: Sourabh Singh Tomar
> Date: 2019-12-11T01:20:40+05:30
> New Revision: d82b6ba21b32ddf00af886b9160feef88211773e
>
> URL:
> https://github.com/llvm/llvm-project/commit/d82b6ba21b32ddf00af886b9160feef88211773e
> DIFF:
> https://github.com/llvm/llvm-project/commit/d82b6ba21b32ddf00af886b9160feef88211773e.diff
>
> LOG: Revert "[DWARF5] Start emitting DW_AT_dwo_name when -gdwarf-5 is
> specified."
>
> This reverts commit 6ef01588f4d75ef43da4ed2a37ba7a8b8daab259.
> Missing Differetial revision.
>
> Added:
>
>
> Modified:
> clang/test/CodeGen/split-debug-output.c
> clang/test/CodeGen/thinlto-split-dwarf.c
> llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
> llvm/test/DebugInfo/X86/debug_addr.ll
> llvm/test/DebugInfo/X86/string-offsets-table.ll
>
> Removed:
>
>
>
>
> ################################################################################
> diff --git a/clang/test/CodeGen/split-debug-output.c
> b/clang/test/CodeGen/split-debug-output.c
> index 19569f8d574b..1507edd24849 100644
> --- a/clang/test/CodeGen/split-debug-output.c
> +++ b/clang/test/CodeGen/split-debug-output.c
> @@ -1,11 +1,7 @@
> // REQUIRES: x86-registered-target
> -// RUN: %clang_cc1 -triple x86_64-unknown-linux -debug-info-kind=limited
> -dwarf-version=4 -split-dwarf-file foo.dwo -split-dwarf-output %t -emit-obj
> -o - %s | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=DWARFv4 %s
> -// RUN: llvm-dwarfdump -debug-info %t | FileCheck --check-prefix=DWARFv4
> %s
> -
> -// RUN: %clang_cc1 -triple x86_64-unknown-linux -debug-info-kind=limited
> -dwarf-version=5 -split-dwarf-file foo.dwo -split-dwarf-output %t -emit-obj
> -o - %s | llvm-dwarfdump -debug-info - | FileCheck --check-prefix=DWARFv5 %s
> -// RUN: llvm-dwarfdump -debug-info %t | FileCheck --check-prefix=DWARFv5
> %s
> +// RUN: %clang_cc1 -triple x86_64-unknown-linux -debug-info-kind=limited
> -split-dwarf-file foo.dwo -split-dwarf-output %t -emit-obj -o - %s |
> llvm-dwarfdump -debug-info - | FileCheck %s
> +// RUN: llvm-dwarfdump -debug-info %t | FileCheck %s
>
> int f() { return 0; }
>
> -// DWARFv4: DW_AT_GNU_dwo_name ("foo.dwo")
> -// DWARFv5: DW_AT_dwo_name ("foo.dwo")
> +// CHECK: DW_AT_GNU_dwo_name ("foo.dwo")
>
> diff --git a/clang/test/CodeGen/thinlto-split-dwarf.c
> b/clang/test/CodeGen/thinlto-split-dwarf.c
> index 419bd1320bb2..60649b0881bb 100644
> --- a/clang/test/CodeGen/thinlto-split-dwarf.c
> +++ b/clang/test/CodeGen/thinlto-split-dwarf.c
> @@ -13,31 +13,11 @@
> // RUN: -o %t.native.o -split-dwarf-file %t.file.dwo \
> // RUN: -split-dwarf-output %t.output.dwo -x ir %t.o
>
> -// RUN: llvm-dwarfdump %t.native.o | FileCheck --check-prefix=DWARFv4-O %s
> -// RUN: llvm-dwarfdump %t.output.dwo | FileCheck
> --check-prefix=DWARFv4-DWO %s
> +// RUN: llvm-dwarfdump %t.native.o | FileCheck --check-prefix=O %s
> +// RUN: llvm-dwarfdump %t.output.dwo | FileCheck --check-prefix=DWO %s
>
> -// DWARFv4-O: DW_AT_GNU_dwo_name ("{{.*}}.file.dwo")
> -// DWARFv4-O-NOT: DW_TAG_subprogram
> -// DWARFv4-DWO: DW_TAG_subprogram
> -
> -// RUN: %clang_cc1 -debug-info-kind=limited -dwarf-version=5 -triple
> x86_64-unknown-linux-gnu \
> -// RUN: -flto=thin -emit-llvm-bc \
> -// RUN: -o %t.o %s
> -
> -// RUN: llvm-lto2 run -thinlto-distributed-indexes %t.o \
> -// RUN: -o %t2.index \
> -// RUN: -r=%t.o,main,px
> -
> -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu \
> -// RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc \
> -// RUN: -o %t.native.o -dwarf-version=5 -split-dwarf-file %t.file.dwo \
> -// RUN: -split-dwarf-output %t.output.dwo -x ir %t.o
> -
> -// RUN: llvm-dwarfdump %t.native.o | FileCheck --check-prefix=DWARFv5-O %s
> -// RUN: llvm-dwarfdump %t.output.dwo | FileCheck
> --check-prefix=DWARFv5-DWO %s
> -
> -// DWARFv5-O: DW_AT_dwo_name ("{{.*}}.file.dwo")
> -// DWARFv5-O-NOT: DW_TAG_subprogram
> -// DWARFv5-DWO: DW_TAG_subprogram
> +// O: DW_AT_GNU_dwo_name ("{{.*}}.file.dwo")
> +// O-NOT: DW_TAG_subprogram
> +// DWO: DW_TAG_subprogram
>
> int main() {}
>
> diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> index f6039cc5bc00..89a0e350f8fe 100644
> --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> @@ -856,13 +856,10 @@ void DwarfDebug::finishUnitAttributes(const
> DICompileUnit *DIUnit,
> // This CU is either a clang module DWO or a skeleton CU.
> NewCU.addUInt(Die, dwarf::DW_AT_GNU_dwo_id, dwarf::DW_FORM_data8,
> DIUnit->getDWOId());
> - if (!DIUnit->getSplitDebugFilename().empty()) {
> + if (!DIUnit->getSplitDebugFilename().empty())
> // This is a prefabricated skeleton CU.
> - dwarf::Attribute attrDWOName = getDwarfVersion() >= 5
> - ? dwarf::DW_AT_dwo_name
> - : dwarf::DW_AT_GNU_dwo_name;
> - NewCU.addString(Die, attrDWOName, DIUnit->getSplitDebugFilename());
> - }
> + NewCU.addString(Die, dwarf::DW_AT_GNU_dwo_name,
> + DIUnit->getSplitDebugFilename());
> }
> }
> // Create new DwarfCompileUnit for the given metadata node with tag
> @@ -1104,13 +1101,10 @@ void DwarfDebug::finalizeModuleInfo() {
> bool HasSplitUnit = SkCU && !TheCU.getUnitDie().children().empty();
>
> if (HasSplitUnit) {
> - dwarf::Attribute attrDWOName = getDwarfVersion() >= 5
> - ? dwarf::DW_AT_dwo_name
> - : dwarf::DW_AT_GNU_dwo_name;
> finishUnitAttributes(TheCU.getCUNode(), TheCU);
> - TheCU.addString(TheCU.getUnitDie(), attrDWOName,
> + TheCU.addString(TheCU.getUnitDie(), dwarf::DW_AT_GNU_dwo_name,
> Asm->TM.Options.MCOptions.SplitDwarfFile);
> - SkCU->addString(SkCU->getUnitDie(), attrDWOName,
> + SkCU->addString(SkCU->getUnitDie(), dwarf::DW_AT_GNU_dwo_name,
> Asm->TM.Options.MCOptions.SplitDwarfFile);
> // Emit a unique identifier for this CU.
> uint64_t ID =
>
> diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
> b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
> index 02f915bc6f7b..4ccda628093c 100644
> --- a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
> +++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
> @@ -554,9 +554,7 @@ bool DWARFUnit::parseDWO() {
> DWARFDie UnitDie = getUnitDIE();
> if (!UnitDie)
> return false;
> - auto DWOFileName = getVersion() >= 5
> - ? dwarf::toString(UnitDie.find(DW_AT_dwo_name))
> - :
> dwarf::toString(UnitDie.find(DW_AT_GNU_dwo_name));
> + auto DWOFileName = dwarf::toString(UnitDie.find(DW_AT_GNU_dwo_name));
> if (!DWOFileName)
> return false;
> auto CompilationDir = dwarf::toString(UnitDie.find(DW_AT_comp_dir));
>
> diff --git a/llvm/test/DebugInfo/X86/debug_addr.ll
> b/llvm/test/DebugInfo/X86/debug_addr.ll
> index 424313ac2e64..55e24b2764c1 100644
> --- a/llvm/test/DebugInfo/X86/debug_addr.ll
> +++ b/llvm/test/DebugInfo/X86/debug_addr.ll
> @@ -30,7 +30,7 @@
> ; DWARF5-NOT: Compile Unit
> ; DWARF5: DW_TAG_skeleton_unit
> ; DWARF5-NOT: DW_TAG_{{.*}}
> -; DWARF5: DW_AT_dwo_name{{.*}}test.dwo
> +; DWARF5: DW_AT_GNU_dwo_name{{.*}}test.dwo
> ; DWARF5: DW_AT_addr_base{{.*}}0x00000008
> ; DWARF5: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000000) address =
> 0x0000000000000000 ".text")
> ; DWARF5: .debug_addr contents:
>
> diff --git a/llvm/test/DebugInfo/X86/string-offsets-table.ll
> b/llvm/test/DebugInfo/X86/string-offsets-table.ll
> index cff779445ed2..be960d1e017c 100644
> --- a/llvm/test/DebugInfo/X86/string-offsets-table.ll
> +++ b/llvm/test/DebugInfo/X86/string-offsets-table.ll
> @@ -60,7 +60,7 @@
> ; SPLIT-NOT: {{DW_TAG|contents:}}
> ; SPLIT: DW_AT_str_offsets_base [DW_FORM_sec_offset] (0x00000008)
> ; SPLIT: DW_AT_comp_dir [DW_FORM_strx1] (indexed (00000000) string =
> "/home/test")
> -; SPLIT: DW_AT_dwo_name [DW_FORM_strx1] (indexed (00000001) string =
> "foo.dwo")
> +; SPLIT: DW_AT_GNU_dwo_name [DW_FORM_strx1] (indexed (00000001)
> string = "foo.dwo")
>
> ; Check for the split CU in .debug_info.dwo.
> ; SPLIT: .debug_info.dwo contents:
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191210/3b7493af/attachment-0001.html>
More information about the cfe-commits
mailing list