RE: [clang] d82b6ba - Revert "[DWARF5] Start emitting DW_AT_dwo_name when -gdwarf-5 is specified."
[AMD Official Use Only - Internal Distribution Only]
Thank You! Eric for clarifying this. I wasn't sure about this.
I don't know why my git script missed that string in commit message, and
allowed me to commit it.
Any way thanks again.
From: Eric Christopher
Sent: Wednesday, December 11, 2019 1:24 AM
To: Tomar, Sourabh Singh ; Sourabh Singh Tomar
Cc: Clang Commits
Subject: Re: [clang] d82b6ba - Revert "[DWARF5] Start emitting DW_AT_dwo_name
when -gdwarf-5 is specified."
[CAUTION: External Email]
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
mailto:cfe-commits@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<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fllvm%2Fllvm-project%2Fcommit%2Fd82b6ba21b32ddf00af886b9160feef88211773e=02%7C01%7CSourabhSingh.Tomar%40amd.com%7Cfbedcd2f28364ee2b93308d77daab84c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637116044519270228=PiOGox%2Bou%2Fh86nY9xlMDibkao2WWE6SsKdVHYgz6tWk%3D=0>
DIFF:
https://github.com/llvm/llvm-project/commit/d82b6ba21b32ddf00af886b9160feef88211773e.diff<https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fllvm%2Fllvm-project%2Fcommit%2Fd82b6ba21b32ddf00af886b9160feef88211773e.diff=02%7C01%7CSourabhSingh.Tomar%40amd.com%7Cfbedcd2f28364ee2b93308d77daab84c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637116044519270228=ry1QJ43mKjnflU1Dm9p2z04L76ACjYSwDElCaLG9WFM%3D=0>
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-dwarfdu
Re: [clang] d82b6ba - Revert "[DWARF5] Start emitting DW_AT_dwo_name when -gdwarf-5 is specified."
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@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 =
