|
 |
cf88888 |
From 2ad5ac11b17dac347d29191872b2b3d601bbcd1f Mon Sep 17 00:00:00 2001
|
|
|
cf88888 |
From: Jonas Devlieghere <jonas@devlieghere.com>
|
|
|
cf88888 |
Date: Fri, 21 Sep 2018 12:03:14 +0000
|
|
|
cf88888 |
Subject: [PATCH 1/2] Ensure that variant part discriminator is read by
|
|
|
cf88888 |
MetadataLoader
|
|
|
cf88888 |
|
|
|
cf88888 |
https://reviews.llvm.org/D42082 introduced variant parts to debug info
|
|
|
cf88888 |
in LLVM. Subsequent work on the Rust compiler has found a bug in that
|
|
|
cf88888 |
patch; namely, there is a path in MetadataLoader that fails to restore
|
|
|
cf88888 |
the discriminator.
|
|
|
cf88888 |
|
|
|
cf88888 |
This patch fixes the bug.
|
|
|
cf88888 |
|
|
|
cf88888 |
Patch by: Tom Tromey
|
|
|
cf88888 |
|
|
|
cf88888 |
Differential revision: https://reviews.llvm.org/D52340
|
|
|
cf88888 |
|
|
|
cf88888 |
llvm-svn: 342725
|
|
|
cf88888 |
---
|
|
|
cf88888 |
llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 2 +-
|
|
|
cf88888 |
llvm/test/Assembler/debug-variant-discriminator.ll | 14 ++++++++++++++
|
|
|
cf88888 |
2 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
cf88888 |
create mode 100644 llvm/test/Assembler/debug-variant-discriminator.ll
|
|
|
cf88888 |
|
|
|
cf88888 |
diff --git a/lib/Bitcode/Reader/MetadataLoader.cpp b/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
|
cf88888 |
index 011c41e2cecd..a7b542efc19e 100644
|
|
|
cf88888 |
--- a/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
|
cf88888 |
+++ b/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
|
cf88888 |
@@ -1308,7 +1308,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
|
|
|
cf88888 |
(Context, Tag, Name, File, Line, Scope, BaseType,
|
|
|
cf88888 |
SizeInBits, AlignInBits, OffsetInBits, Flags,
|
|
|
cf88888 |
Elements, RuntimeLang, VTableHolder, TemplateParams,
|
|
|
cf88888 |
- Identifier));
|
|
|
cf88888 |
+ Identifier, Discriminator));
|
|
|
cf88888 |
if (!IsNotUsedInTypeRef && Identifier)
|
|
|
cf88888 |
MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT));
|
|
|
cf88888 |
|
|
|
cf88888 |
diff --git a/test/Assembler/debug-variant-discriminator.ll b/test/Assembler/debug-variant-discriminator.ll
|
|
|
cf88888 |
new file mode 100644
|
|
|
cf88888 |
index 000000000000..5be001cad6be
|
|
|
cf88888 |
--- /dev/null
|
|
|
cf88888 |
+++ b/test/Assembler/debug-variant-discriminator.ll
|
|
|
cf88888 |
@@ -0,0 +1,14 @@
|
|
|
cf88888 |
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
|
|
|
cf88888 |
+; RUN: verify-uselistorder %s
|
|
|
cf88888 |
+
|
|
|
cf88888 |
+; CHECK: !named = !{!0, !1, !2}
|
|
|
cf88888 |
+!named = !{!0, !1, !2}
|
|
|
cf88888 |
+
|
|
|
cf88888 |
+; CHECK: !0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer")
|
|
|
cf88888 |
+; CHECK-NEXT: !1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2)
|
|
|
cf88888 |
+; CHECK-NEXT: !2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial)
|
|
|
cf88888 |
+; CHECK-NEXT: !3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)
|
|
|
cf88888 |
+!0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer")
|
|
|
cf88888 |
+!1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2)
|
|
|
cf88888 |
+!2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial)
|
|
|
cf88888 |
+!3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned)
|
|
|
cf88888 |
--
|
|
|
cf88888 |
2.20.1
|
|
|
cf88888 |
|