Skip to content
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

Jump to bottom

[msan] Don't modify CFG iterating it #90691

Merged
merged 4 commits into from
May 1, 2024
Merged

[msan] Don't modify CFG iterating it #90691

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cfab95
[𝘀𝗽𝗿] initial version
vitalybuka May 1, 2024
2fdcc90
move debug counter back
vitalybuka May 1, 2024
e31d66f
remove "instrument"
vitalybuka May 1, 2024
08b135a
rebase
vitalybuka May 1, 2024
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: 8 additions & 1 deletion llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,6 +1135,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
std::unique_ptr<VarArgHelper> VAHelper;
const TargetLibraryInfo *TLI;
Instruction *FnPrologueEnd;
SmallVector<Instruction *, 16> Instructions;

// The following flags disable parts of MSan instrumentation based on
// exclusion list contents and command-line options.
Expand Down Expand Up @@ -1520,6 +1521,11 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
for (BasicBlock *BB : depth_first(FnPrologueEnd->getParent()))
visit(*BB);

// `visit` above only collects instructions. Process them after iterating
// CFG to avoid requirement on CFG transformations.
for (Instruction *I : Instructions)
InstVisitor<MemorySanitizerVisitor>::visit(*I);

// Finalize PHI nodes.
for (PHINode *PN : ShadowPHINodes) {
PHINode *PNS = cast<PHINode>(getShadow(PN));
Expand Down Expand Up @@ -2196,7 +2202,8 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
setOrigin(&I, getCleanOrigin());
return;
}
InstVisitor<MemorySanitizerVisitor>::visit(I);

Instructions.push_back(&I);
}

/// Instrument LoadInst
Expand Down
Loading