mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-26 19:35:44 +00:00
33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
Index: llvm/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
===================================================================
|
|
--- llvm.orig/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
+++ llvm/lib/Bitcode/Reader/MetadataLoader.cpp
|
|
@@ -1313,7 +1313,7 @@
|
|
(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));
|
|
|
|
Index: llvm/test/Assembler/debug-variant-discriminator.ll
|
|
===================================================================
|
|
--- llvm.orig/test/Assembler/debug-variant-discriminator.ll
|
|
+++ 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)
|