Skip to content

[AssumptionCache] Don't use ResultElem for assumption list (NFC) #160462

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
Sep 24, 2025
Merged

[AssumptionCache] Don't use ResultElem for assumption list (NFC) #160462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b614ead
[AssumptionCache] Don't use ResultElem for assumption list (NFC)
nikic Sep 24, 2025
e6e9041
add const
nikic Sep 24, 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
4 changes: 2 additions & 2 deletions llvm/include/llvm/Analysis/AssumptionCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class AssumptionCache {

/// Vector of weak value handles to calls of the \@llvm.assume
/// intrinsic.
SmallVector<ResultElem, 4> AssumeHandles;
SmallVector<WeakVH, 4> AssumeHandles;

class LLVM_ABI AffectedValueCallbackVH final : public CallbackVH {
AssumptionCache *AC;
Expand Down Expand Up @@ -148,7 +148,7 @@ class AssumptionCache {
/// FIXME: We should replace this with pointee_iterator<filter_iterator<...>>
/// when we can write that to filter out the null values. Then caller code
/// will become simpler.
MutableArrayRef<ResultElem> assumptions() {
MutableArrayRef<WeakVH> assumptions() {
if (!Scanned)
scanFunction();
return AssumeHandles;
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Analysis/AssumptionCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void AssumptionCache::scanFunction() {
for (BasicBlock &B : F)
for (Instruction &I : B)
if (isa<AssumeInst>(&I))
AssumeHandles.push_back({&I, ExprResultIdx});
AssumeHandles.push_back(&I);

// Mark the scan as complete.
Scanned = true;
Expand All @@ -188,7 +188,7 @@ void AssumptionCache::registerAssumption(AssumeInst *CI) {
if (!Scanned)
return;

AssumeHandles.push_back({CI, ExprResultIdx});
AssumeHandles.push_back(CI);

#ifndef NDEBUG
assert(CI->getParent() &&
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/Scalar/DropUnnecessaryAssumes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ DropUnnecessaryAssumesPass::run(Function &F, FunctionAnalysisManager &FAM) {
AssumptionCache &AC = FAM.getResult<AssumptionAnalysis>(F);
bool Changed = false;

for (AssumptionCache::ResultElem &Elem : AC.assumptions()) {
auto *Assume = cast_or_null<AssumeInst>(Elem.Assume);
for (const WeakVH &Elem : AC.assumptions()) {
auto *Assume = cast_or_null<AssumeInst>(Elem);
if (!Assume)
continue;

Expand Down