[analyzer][NFC] Trivial refactoring of region invalidation #102456
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit removes `invalidateRegionsImpl()`, moving its body to `invalidateRegions(ValueList Values, ...)`, because it was a completely useless layer of indirection. Moreover I'm fixing some strange indentation within this function body and renaming two variables to the proper `UpperCamelCase` format.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Donát Nagy (NagyDonat) ChangesThis commit removes Moreover I'm fixing some strange indentation within this function body and renaming two variables to the proper Full diff: https://github.com/llvm/llvm-project/pull/102456.diff 2 Files Affected:
diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
index 51d76dc257ee9..9889d2604a890 100644
--- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -484,17 +484,6 @@ class ProgramState : public llvm::FoldingSetNode {
friend void ProgramStateRetain(const ProgramState *state);
friend void ProgramStateRelease(const ProgramState *state);
- /// \sa invalidateValues()
- /// \sa invalidateRegions()
- ProgramStateRef
- invalidateRegionsImpl(ArrayRef<SVal> Values,
- const Expr *E, unsigned BlockCount,
- const LocationContext *LCtx,
- bool ResultsInSymbolEscape,
- InvalidatedSymbols *IS,
- RegionAndSymbolInvalidationTraits *HTraits,
- const CallEvent *Call) const;
-
SVal wrapSymbolicRegion(SVal Base) const;
};
diff --git a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
index f82cd944750a3..e6d3399a21942 100644
--- a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
@@ -159,8 +159,8 @@ ProgramState::invalidateRegions(RegionList Regions,
for (const MemRegion *Reg : Regions)
Values.push_back(loc::MemRegionVal(Reg));
- return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
- IS, ITraits, Call);
+ return invalidateRegions(Values, E, Count, LCtx, CausedByPointerEscape, IS,
+ Call, ITraits);
}
ProgramStateRef
@@ -172,18 +172,6 @@ ProgramState::invalidateRegions(ValueList Values,
const CallEvent *Call,
RegionAndSymbolInvalidationTraits *ITraits) const {
- return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
- IS, ITraits, Call);
-}
-
-ProgramStateRef
-ProgramState::invalidateRegionsImpl(ValueList Values,
- const Expr *E, unsigned Count,
- const LocationContext *LCtx,
- bool CausedByPointerEscape,
- InvalidatedSymbols *IS,
- RegionAndSymbolInvalidationTraits *ITraits,
- const CallEvent *Call) const {
ProgramStateManager &Mgr = getStateManager();
ExprEngine &Eng = Mgr.getOwningEngine();
@@ -197,21 +185,18 @@ ProgramState::invalidateRegionsImpl(ValueList Values,
StoreManager::InvalidatedRegions TopLevelInvalidated;
StoreManager::InvalidatedRegions Invalidated;
- const StoreRef &newStore
- = Mgr.StoreMgr->invalidateRegions(getStore(), Values, E, Count, LCtx, Call,
- *IS, *ITraits, &TopLevelInvalidated,
- &Invalidated);
+ const StoreRef &NewStore = Mgr.StoreMgr->invalidateRegions(
+ getStore(), Values, E, Count, LCtx, Call, *IS, *ITraits,
+ &TopLevelInvalidated, &Invalidated);
- ProgramStateRef newState = makeWithStore(newStore);
+ ProgramStateRef NewState = makeWithStore(NewStore);
if (CausedByPointerEscape) {
- newState = Eng.notifyCheckersOfPointerEscape(newState, IS,
- TopLevelInvalidated,
- Call,
- *ITraits);
+ NewState = Eng.notifyCheckersOfPointerEscape(
+ NewState, IS, TopLevelInvalidated, Call, *ITraits);
}
- return Eng.processRegionChanges(newState, IS, TopLevelInvalidated,
+ return Eng.processRegionChanges(NewState, IS, TopLevelInvalidated,
Invalidated, LCtx, Call);
}
|
|
@llvm/pr-subscribers-clang-static-analyzer-1 Author: Donát Nagy (NagyDonat) ChangesThis commit removes Moreover I'm fixing some strange indentation within this function body and renaming two variables to the proper Full diff: https://github.com/llvm/llvm-project/pull/102456.diff 2 Files Affected:
diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
index 51d76dc257ee94..9889d2604a890e 100644
--- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
+++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -484,17 +484,6 @@ class ProgramState : public llvm::FoldingSetNode {
friend void ProgramStateRetain(const ProgramState *state);
friend void ProgramStateRelease(const ProgramState *state);
- /// \sa invalidateValues()
- /// \sa invalidateRegions()
- ProgramStateRef
- invalidateRegionsImpl(ArrayRef<SVal> Values,
- const Expr *E, unsigned BlockCount,
- const LocationContext *LCtx,
- bool ResultsInSymbolEscape,
- InvalidatedSymbols *IS,
- RegionAndSymbolInvalidationTraits *HTraits,
- const CallEvent *Call) const;
-
SVal wrapSymbolicRegion(SVal Base) const;
};
diff --git a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
index f82cd944750a3c..e6d3399a219424 100644
--- a/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
@@ -159,8 +159,8 @@ ProgramState::invalidateRegions(RegionList Regions,
for (const MemRegion *Reg : Regions)
Values.push_back(loc::MemRegionVal(Reg));
- return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
- IS, ITraits, Call);
+ return invalidateRegions(Values, E, Count, LCtx, CausedByPointerEscape, IS,
+ Call, ITraits);
}
ProgramStateRef
@@ -172,18 +172,6 @@ ProgramState::invalidateRegions(ValueList Values,
const CallEvent *Call,
RegionAndSymbolInvalidationTraits *ITraits) const {
- return invalidateRegionsImpl(Values, E, Count, LCtx, CausedByPointerEscape,
- IS, ITraits, Call);
-}
-
-ProgramStateRef
-ProgramState::invalidateRegionsImpl(ValueList Values,
- const Expr *E, unsigned Count,
- const LocationContext *LCtx,
- bool CausedByPointerEscape,
- InvalidatedSymbols *IS,
- RegionAndSymbolInvalidationTraits *ITraits,
- const CallEvent *Call) const {
ProgramStateManager &Mgr = getStateManager();
ExprEngine &Eng = Mgr.getOwningEngine();
@@ -197,21 +185,18 @@ ProgramState::invalidateRegionsImpl(ValueList Values,
StoreManager::InvalidatedRegions TopLevelInvalidated;
StoreManager::InvalidatedRegions Invalidated;
- const StoreRef &newStore
- = Mgr.StoreMgr->invalidateRegions(getStore(), Values, E, Count, LCtx, Call,
- *IS, *ITraits, &TopLevelInvalidated,
- &Invalidated);
+ const StoreRef &NewStore = Mgr.StoreMgr->invalidateRegions(
+ getStore(), Values, E, Count, LCtx, Call, *IS, *ITraits,
+ &TopLevelInvalidated, &Invalidated);
- ProgramStateRef newState = makeWithStore(newStore);
+ ProgramStateRef NewState = makeWithStore(NewStore);
if (CausedByPointerEscape) {
- newState = Eng.notifyCheckersOfPointerEscape(newState, IS,
- TopLevelInvalidated,
- Call,
- *ITraits);
+ NewState = Eng.notifyCheckersOfPointerEscape(
+ NewState, IS, TopLevelInvalidated, Call, *ITraits);
}
- return Eng.processRegionChanges(newState, IS, TopLevelInvalidated,
+ return Eng.processRegionChanges(NewState, IS, TopLevelInvalidated,
Invalidated, LCtx, Call);
}
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit removes
invalidateRegionsImpl(), moving its body toinvalidateRegions(ValueList Values, ...), because it was a completely useless layer of indirection.Moreover I'm fixing some strange indentation within this function body and renaming two variables to the proper
UpperCamelCaseformat.