Skip to content

[NFC] [MTE] simplify tagp logic #110337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2024
Merged

[NFC] [MTE] simplify tagp logic #110337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions llvm/lib/Target/AArch64/AArch64StackTagging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,16 +594,15 @@ bool AArch64StackTagging::runOnFunction(Function &Fn) {
IRBuilder<> IRB(Info.AI->getNextNode());
Function *TagP = Intrinsic::getDeclaration(
F->getParent(), Intrinsic::aarch64_tagp, {Info.AI->getType()});
Instruction *TagPCall =
IRB.CreateCall(TagP, {Constant::getNullValue(Info.AI->getType()), Base,
ConstantInt::get(IRB.getInt64Ty(), Tag)});
Instruction *TagPCall = IRB.CreateCall(
TagP, {Info.AI, Base, ConstantInt::get(IRB.getInt64Ty(), Tag)});
if (Info.AI->hasName())
TagPCall->setName(Info.AI->getName() + ".tag");
// Does not replace metadata, so we don't have to handle DbgVariableRecords.
Info.AI->replaceUsesWithIf(TagPCall, [&](const Use &U) {
return !memtag::isLifetimeIntrinsic(U.getUser());
return !memtag::isLifetimeIntrinsic(U.getUser()) &&
U.getUser() != TagPCall;
});
TagPCall->setOperand(0, Info.AI);

// Calls to functions that may return twice (e.g. setjmp) confuse the
// postdominator analysis, and will leave us to keep memory tagged after
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.