This is an archive of the discontinued LLVM Phabricator instance.

Differential D141140

[Assignment Tracking] Do not verify against an empty metadata address operand
ClosedPublic

Authored by Orlando on Jan 6 2023, 8:19 AM.

Details

Reviewers
StephenTozer
scott.linder
jryans
Commits
rG521ab024584f: [Assignment Tracking] Do not verify against an empty metadata address operand
Summary

This copies existing behaviour from other debug intrinsics to dbg.assigns.

Diff Detail

Event Timeline

Orlando created this revision.Jan 6 2023, 8:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 6 2023, 8:19 AM
Herald added a subscriber: hiraditya. · View Herald Transcript
Orlando requested review of this revision.Jan 6 2023, 8:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 6 2023, 8:19 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Orlando mentioned this in D140901: [DebugInfo] Do not delete debug intrinsics with empty metadata operands.Jan 6 2023, 8:22 AM
Orlando added a child revision: D140901: [DebugInfo] Do not delete debug intrinsics with empty metadata operands.Jan 6 2023, 8:28 AM
Harbormaster completed remote builds in B206130: Diff 486891.Jan 6 2023, 10:02 AM
Orlando edited the summary of this revision. (Show Details)Jan 9 2023, 8:34 AM
scott.linder accepted this revision.Jan 9 2023, 3:56 PM
This revision is now accepted and ready to land.Jan 9 2023, 3:56 PM
This revision was landed with ongoing or failed builds.Jan 11 2023, 8:38 AM
Closed by commit rG521ab024584f: [Assignment Tracking] Do not verify against an empty metadata address operand (authored by Orlando). · Explain Why
This revision was automatically updated to reflect the committed changes.
Orlando added a commit: rG521ab024584f: [Assignment Tracking] Do not verify against an empty metadata address operand.
Orlando added a comment.Jan 11 2023, 8:39 AM

Thank you @scott.linder for reviewing these patches

Revision Contents

PathSize
llvm/
lib/
IR/
9 lines
test/
DebugInfo/
Generic/
assignment-tracking/
parse-and-verify/
3 lines

Diff 488243

llvm/lib/IR/Verifier.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,055 Lines • ▼ Show 20 Linesvoid Verifier::visitDbgIntrinsic(StringRef Kind, DbgVariableIntrinsic &DII) {
CheckDI(isa<DIExpression>(DII.getRawExpression()), CheckDI(isa<DIExpression>(DII.getRawExpression()),
"invalid llvm.dbg." + Kind + " intrinsic expression", &DII, "invalid llvm.dbg." + Kind + " intrinsic expression", &DII,
DII.getRawExpression()); DII.getRawExpression());
if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(&DII)) { if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(&DII)) {
CheckDI(isa<DIAssignID>(DAI->getRawAssignID()), CheckDI(isa<DIAssignID>(DAI->getRawAssignID()),
"invalid llvm.dbg.assign intrinsic DIAssignID", &DII, "invalid llvm.dbg.assign intrinsic DIAssignID", &DII,
DAI->getRawAssignID()); DAI->getRawAssignID());
CheckDI(isa<ValueAsMetadata>(DAI->getRawAddress()), const auto *RawAddr = DAI->getRawAddress();
"invalid llvm.dbg.assign intrinsic address)", &DII, CheckDI(
isa<ValueAsMetadata>(RawAddr) ||
(isa<MDNode>(RawAddr) && !cast<MDNode>(RawAddr)->getNumOperands()),
"invalid llvm.dbg.assign intrinsic address", &DII,
DAI->getRawAddress()); DAI->getRawAddress());
CheckDI(isa<DIExpression>(DAI->getRawAddressExpression()), CheckDI(isa<DIExpression>(DAI->getRawAddressExpression()),
"invalid llvm.dbg.assign intrinsic address expression", &DII, "invalid llvm.dbg.assign intrinsic address expression", &DII,
DAI->getRawAddressExpression()); DAI->getRawAddressExpression());
// All of the linked instructions should be in the same function as DII. // All of the linked instructions should be in the same function as DII.
for (Instruction *I : at::getAssignmentInsts(DAI)) for (Instruction *I : at::getAssignmentInsts(DAI))
CheckDI(DAI->getFunction() == I->getFunction(), CheckDI(DAI->getFunction() == I->getFunction(),
"inst not in same function as dbg.assign", I, DAI); "inst not in same function as dbg.assign", I, DAI);
} }
▲ Show 20 Lines • Show All 739 Lines • Show Last 20 Lines

llvm/test/DebugInfo/Generic/assignment-tracking/parse-and-verify/verify.ll

Show All 25 Linesentry:
; CHECK: invalid llvm.dbg.assign intrinsic variable ; CHECK: invalid llvm.dbg.assign intrinsic variable
call void @llvm.dbg.assign(metadata i32 0, metadata !2, metadata !DIExpression(), metadata !14, metadata ptr undef, metadata !DIExpression()), !dbg !13 call void @llvm.dbg.assign(metadata i32 0, metadata !2, metadata !DIExpression(), metadata !14, metadata ptr undef, metadata !DIExpression()), !dbg !13
; CHECK: invalid llvm.dbg.assign intrinsic expression ; CHECK: invalid llvm.dbg.assign intrinsic expression
call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !2, metadata !14, metadata ptr undef, metadata !DIExpression()), !dbg !13 call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !2, metadata !14, metadata ptr undef, metadata !DIExpression()), !dbg !13
; CHECK: invalid llvm.dbg.assign intrinsic DIAssignID ; CHECK: invalid llvm.dbg.assign intrinsic DIAssignID
call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !2, metadata ptr undef, metadata !DIExpression()), !dbg !13 call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !2, metadata ptr undef, metadata !DIExpression()), !dbg !13
; CHECK: invalid llvm.dbg.assign intrinsic address ; CHECK: invalid llvm.dbg.assign intrinsic address
call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !14, metadata !3, metadata !DIExpression()), !dbg !13 call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !14, metadata !3, metadata !DIExpression()), !dbg !13
;; Empty metadata debug operands are allowed.
; CHECK-NOT: invalid llvm.dbg.assign
call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !14, metadata !2, metadata !DIExpression()), !dbg !13
; CHECK: invalid llvm.dbg.assign intrinsic address expression ; CHECK: invalid llvm.dbg.assign intrinsic address expression
call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !14, metadata ptr undef, metadata !2), !dbg !13 call void @llvm.dbg.assign(metadata !14, metadata !10, metadata !DIExpression(), metadata !14, metadata ptr undef, metadata !2), !dbg !13
ret void ret void
} }
declare void @llvm.dbg.value(metadata, metadata, metadata) declare void @llvm.dbg.value(metadata, metadata, metadata)
declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata) declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata)
Show All 19 Lines