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