diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2018-09-21 12:03:14 +0000 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2018-09-21 12:03:14 +0000 |
| commit | a0c9cb1913d14bfcae8c102d2245f73f103f39af (patch) | |
| tree | 9452dcc0a9eed683bdf3425feb8e59fc0302d677 /llvm | |
| parent | 907ed15f998bab7e2e11b32eb02db83fe7272cbb (diff) | |
| download | bcm5719-llvm-a0c9cb1913d14bfcae8c102d2245f73f103f39af.tar.gz bcm5719-llvm-a0c9cb1913d14bfcae8c102d2245f73f103f39af.zip | |
Ensure that variant part discriminator is read by MetadataLoader
https://reviews.llvm.org/D42082 introduced variant parts to debug info
in LLVM. Subsequent work on the Rust compiler has found a bug in that
patch; namely, there is a path in MetadataLoader that fails to restore
the discriminator.
This patch fixes the bug.
Patch by: Tom Tromey
Differential revision: https://reviews.llvm.org/D52340
llvm-svn: 342725
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Assembler/debug-variant-discriminator.ll | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp index 3fe7d220563..4781cfe3dea 100644 --- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp +++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp @@ -1313,7 +1313,7 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata( (Context, Tag, Name, File, Line, Scope, BaseType, SizeInBits, AlignInBits, OffsetInBits, Flags, Elements, RuntimeLang, VTableHolder, TemplateParams, - Identifier)); + Identifier, Discriminator)); if (!IsNotUsedInTypeRef && Identifier) MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT)); diff --git a/llvm/test/Assembler/debug-variant-discriminator.ll b/llvm/test/Assembler/debug-variant-discriminator.ll new file mode 100644 index 00000000000..5be001cad6b --- /dev/null +++ b/llvm/test/Assembler/debug-variant-discriminator.ll @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s +; RUN: verify-uselistorder %s + +; CHECK: !named = !{!0, !1, !2} +!named = !{!0, !1, !2} + +; CHECK: !0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer") +; CHECK-NEXT: !1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2) +; CHECK-NEXT: !2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial) +; CHECK-NEXT: !3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned) +!0 = !DICompositeType(tag: DW_TAG_structure_type, name: "Outer", size: 64, align: 64, identifier: "Outer") +!1 = !DICompositeType(tag: DW_TAG_variant_part, scope: !0, size: 64, discriminator: !2) +!2 = !DIDerivedType(tag: DW_TAG_member, scope: !1, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial) +!3 = !DIBasicType(name: "u64", size: 64, encoding: DW_ATE_unsigned) |
