This is an archive of the discontinued LLVM Phabricator instance.

Differential D52340

Ensure that variant part discriminator is read by MetadataLoader
ClosedPublic

Authored by tromey on Sep 20 2018, 10:14 PM.

Details

Reviewers
aprantl
JDevlieghere
Commits
rGa0c9cb1913d1: Ensure that variant part discriminator is read by MetadataLoader
rL342725: Ensure that variant part discriminator is read by MetadataLoader
Summary

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.

Diff Detail

Event Timeline

tromey created this revision.Sep 20 2018, 10:14 PM
Herald added subscribers: llvm-commits, JDevlieghere, aprantl. · View Herald TranscriptSep 20 2018, 10:14 PM
tromey added a reviewer: aprantl.Sep 20 2018, 10:15 PM
Harbormaster completed remote builds in B22907: Diff 166403.Sep 20 2018, 10:16 PM
JDevlieghere accepted this revision.Sep 20 2018, 11:45 PM

LGTM, Thanks!

This revision is now accepted and ready to land.Sep 20 2018, 11:45 PM
tromey added a comment.Sep 21 2018, 4:59 AM

Could someone please land this for me? Thank you.

Closed by commit rL342725: Ensure that variant part discriminator is read by MetadataLoader (authored by JDevlieghere). · Explain WhySep 21 2018, 5:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Bitcode/
Reader/
2 lines
test/
Assembler/
14 lines

Diff 166403

lib/Bitcode/Reader/MetadataLoader.cpp

Show First 20 Lines • Show All 1,307 Lines • ▼ Show 20 Lines if (Identifier)
VTableHolder, TemplateParams, Discriminator); VTableHolder, TemplateParams, Discriminator);
// Create a node if we didn't get a lazy ODR type. // Create a node if we didn't get a lazy ODR type.
if (!CT) if (!CT)
CT = GET_OR_DISTINCT(DICompositeType, CT = GET_OR_DISTINCT(DICompositeType,
(Context, Tag, Name, File, Line, Scope, BaseType, (Context, Tag, Name, File, Line, Scope, BaseType,
SizeInBits, AlignInBits, OffsetInBits, Flags, SizeInBits, AlignInBits, OffsetInBits, Flags,
Elements, RuntimeLang, VTableHolder, TemplateParams, Elements, RuntimeLang, VTableHolder, TemplateParams,
Identifier)); Identifier, Discriminator));
if (!IsNotUsedInTypeRef && Identifier) if (!IsNotUsedInTypeRef && Identifier)
MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT)); MetadataList.addTypeRef(*Identifier, *cast<DICompositeType>(CT));
MetadataList.assignValue(CT, NextMetadataNo); MetadataList.assignValue(CT, NextMetadataNo);
NextMetadataNo++; NextMetadataNo++;
break; break;
} }
case bitc::METADATA_SUBROUTINE_TYPE: { case bitc::METADATA_SUBROUTINE_TYPE: {
▲ Show 20 Lines • Show All 696 Lines • Show Last 20 Lines

test/Assembler/debug-variant-discriminator.ll

  • This file was added.
; 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)