Skip to content

[MemProf] Avoid assertion checking loop under NDEBUG (NFC) #138985

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 2 commits into from
May 8, 2025
Merged

[MemProf] Avoid assertion checking loop under NDEBUG (NFC) #138985

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f341ed
[MemProf] Avoid assertion checking loop under NDEBUG (NFC)
teresajohnson May 7, 2025
f69b5aa
Address comments
teresajohnson May 8, 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
2 changes: 2 additions & 0 deletions llvm/lib/Transforms/IPO/MemProfContextDisambiguation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5242,6 +5242,7 @@ bool MemProfContextDisambiguation::applyImport(Module &M) {
assert(AI != FS->allocs().end());
auto &AllocNode = *(AI++);

#ifndef NDEBUG
// Sanity check that the MIB stack ids match between the summary and
// instruction metadata.
auto MIBIter = AllocNode.MIBs.begin();
Copy link

@snehasish snehasish May 7, 2025

Choose a reason for hiding this comment

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

Can we refactor this out to a static helper? I think it should be straightforward since the only live ins for this region are AllocNode and MemProfMD as far as I can tell.

Copy link
Contributor Author

@teresajohnson teresajohnson May 8, 2025

Choose a reason for hiding this comment

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

Done. There were a couple of other live in variables. I also updated one of the methods to take a const to enable using const for the new helper.

Expand Down Expand Up @@ -5276,6 +5277,7 @@ bool MemProfContextDisambiguation::applyImport(Module &M) {
}
MIBIter++;
}
#endif

// Perform cloning if not yet done.
CloneFuncIfNeeded(/*NumClones=*/AllocNode.Versions.size());
Expand Down
Loading