Skip to content

[flang][mlir] Fix-forward heap use-after-free in #155348 #164712

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 4 commits into from
Oct 22, 2025
Merged

[flang][mlir] Fix-forward heap use-after-free in #155348 #164712

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
882c027
[flang[mlir] Fix-forward heap use-after-free in #155348
thurstond Oct 22, 2025
322b9f0
Fix the fix
thurstond Oct 22, 2025
7fdd34a
Replace mapInfoOp
thurstond Oct 22, 2025
d53b6f9
clang-format
thurstond Oct 22, 2025
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
7 changes: 4 additions & 3 deletions mlir/lib/Dialect/OpenMP/Transforms/OpenMPOffloadPrivatizationPrepare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,11 @@ class PrepareForOMPOffloadPrivatizationPass
// variable, rewrite all the uses of the original variable with
// the heap-allocated variable.
rewriter.setInsertionPoint(targetOp);
rewriter.setInsertionPoint(cloneModifyAndErase(mapInfoOp));
auto clonedOp = cast<omp::MapInfoOp>(cloneModifyAndErase(mapInfoOp));
Copy link
Collaborator

@joker-eph joker-eph Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just updating it:

Suggested change
auto clonedOp = cast<omp::MapInfoOp>(cloneModifyAndErase(mapInfoOp));
mapInfoOp = cast<omp::MapInfoOp>(cloneModifyAndErase(mapInfoOp));

That way no risk of misusing mapInfoOp anymore?

Copy link
Contributor Author

@thurstond thurstond Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, thanks! Done: 7fdd34a

rewriter.setInsertionPoint(clonedOp);

// Fix any members that may use varPtr to now use heapMem
for (auto member : mapInfoOp.getMembers()) {
for (auto member : clonedOp.getMembers()) {
auto memberMapInfoOp = cast<omp::MapInfoOp>(member.getDefiningOp());
if (!usesVarPtr(memberMapInfoOp))
continue;
Expand All @@ -275,7 +276,7 @@ class PrepareForOMPOffloadPrivatizationPass
// targetOp.
if (isPrivatizedByValue) {
rewriter.setInsertionPoint(targetOp);
auto newPrivVar = LLVM::LoadOp::create(rewriter, mapInfoOp.getLoc(),
auto newPrivVar = LLVM::LoadOp::create(rewriter, clonedOp.getLoc(),
varType, heapMem);
newPrivVars.push_back(newPrivVar);
}
Expand Down