Skip to content

Commit 9ef7466

Browse files
committed
Fix formatting.
1 parent faf0d61 commit 9ef7466

File tree

10 files changed

+45
-47
lines changed

10 files changed

+45
-47
lines changed

clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ class CoreEngine {
136136

137137
public:
138138
/// Construct a CoreEngine object to analyze the provided CFG.
139-
CoreEngine(ExprEngine &exprengine,
140-
FunctionSummariesTy *FS,
139+
CoreEngine(ExprEngine &exprengine, FunctionSummariesTy *FS,
141140
AnalyzerOptions &Opts,
142141
llvm::BumpPtrAllocator &BlockCounterFactoryAllocator);
143142

clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ class ExprEngine {
180180

181181
public:
182182
ExprEngine(cross_tu::CrossTranslationUnitContext &CTU, AnalysisManager &mgr,
183-
SetOfConstDecls *VisitedCalleesIn,
184-
FunctionSummariesTy *FS, InliningModes HowToInlineIn,
183+
SetOfConstDecls *VisitedCalleesIn, FunctionSummariesTy *FS,
184+
InliningModes HowToInlineIn,
185185
std::array<llvm::BumpPtrAllocator, 7> &ProgramStateAllocators,
186186
llvm::BumpPtrAllocator &BlockCounterFactoryAllocator);
187187

clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,11 +527,10 @@ class ProgramStateManager {
527527
std::vector<ProgramState *> freeStates;
528528

529529
public:
530-
ProgramStateManager(ASTContext &Ctx,
531-
StoreManagerCreator CreateStoreManager,
532-
ConstraintManagerCreator CreateConstraintManager,
533-
std::array<llvm::BumpPtrAllocator, 7> &Allocators,
534-
ExprEngine *expreng);
530+
ProgramStateManager(ASTContext &Ctx, StoreManagerCreator CreateStoreManager,
531+
ConstraintManagerCreator CreateConstraintManager,
532+
std::array<llvm::BumpPtrAllocator, 7> &Allocators,
533+
ExprEngine *expreng);
535534

536535
~ProgramStateManager();
537536

clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,11 @@ class SValBuilder {
411411
const StackFrameContext *SFC);
412412
};
413413

414-
SValBuilder* createSimpleSValBuilder(llvm::BumpPtrAllocator &BasicValueFactoryAllocator,
415-
llvm::BumpPtrAllocator &SymbolManagerAllocator,
416-
llvm::BumpPtrAllocator &MemRegionManagerAllocator,
417-
ASTContext &context, ProgramStateManager &stateMgr);
414+
SValBuilder *
415+
createSimpleSValBuilder(llvm::BumpPtrAllocator &BasicValueFactoryAllocator,
416+
llvm::BumpPtrAllocator &SymbolManagerAllocator,
417+
llvm::BumpPtrAllocator &MemRegionManagerAllocator,
418+
ASTContext &context, ProgramStateManager &stateMgr);
418419

419420
} // namespace ento
420421

clang/lib/StaticAnalyzer/Core/CoreEngine.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ static std::unique_ptr<WorkList> generateWorkList(AnalyzerOptions &Opts) {
7575
}
7676

7777
CoreEngine::CoreEngine(ExprEngine &exprengine, FunctionSummariesTy *FS,
78-
AnalyzerOptions &Opts, llvm::BumpPtrAllocator &BlockCounterFactoryAllocator)
78+
AnalyzerOptions &Opts,
79+
llvm::BumpPtrAllocator &BlockCounterFactoryAllocator)
7980
: ExprEng(exprengine), WList(generateWorkList(Opts)),
8081
CTUWList(Opts.IsNaiveCTUEnabled ? generateWorkList(Opts) : nullptr),
8182
BCounterFactory(BlockCounterFactoryAllocator), FunctionSummaries(FS) {}

clang/lib/StaticAnalyzer/Core/ExprEngine.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,17 +219,18 @@ REGISTER_TRAIT_WITH_PROGRAMSTATE(PendingArrayDestruction,
219219

220220
static const char* TagProviderName = "ExprEngine";
221221

222-
ExprEngine::ExprEngine(cross_tu::CrossTranslationUnitContext &CTU,
223-
AnalysisManager &mgr, SetOfConstDecls *VisitedCalleesIn,
224-
FunctionSummariesTy *FS, InliningModes HowToInlineIn,
225-
std::array<llvm::BumpPtrAllocator, 7> &ProgramStateAllocators,
226-
llvm::BumpPtrAllocator& BlockCounterFactoryAllocator)
222+
ExprEngine::ExprEngine(
223+
cross_tu::CrossTranslationUnitContext &CTU, AnalysisManager &mgr,
224+
SetOfConstDecls *VisitedCalleesIn, FunctionSummariesTy *FS,
225+
InliningModes HowToInlineIn,
226+
std::array<llvm::BumpPtrAllocator, 7> &ProgramStateAllocators,
227+
llvm::BumpPtrAllocator &BlockCounterFactoryAllocator)
227228
: CTU(CTU), IsCTUEnabled(mgr.getAnalyzerOptions().IsNaiveCTUEnabled),
228229
AMgr(mgr), AnalysisDeclContexts(mgr.getAnalysisDeclContextManager()),
229230
Engine(*this, FS, mgr.getAnalyzerOptions(), BlockCounterFactoryAllocator),
230-
G(Engine.getGraph()),
231-
StateMgr(getContext(), mgr.getStoreManagerCreator(), mgr.getConstraintManagerCreator(),
232-
ProgramStateAllocators, this),
231+
G(Engine.getGraph()),
232+
StateMgr(getContext(), mgr.getStoreManagerCreator(),
233+
mgr.getConstraintManagerCreator(), ProgramStateAllocators, this),
233234
SymMgr(StateMgr.getSymbolManager()), MRMgr(StateMgr.getRegionManager()),
234235
svalBuilder(StateMgr.getSValBuilder()), ObjCNoRet(mgr.getASTContext()),
235236
BR(mgr, *this), VisitedCallees(VisitedCalleesIn),

clang/lib/StaticAnalyzer/Core/ProgramState.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,18 @@ int64_t ProgramState::getID() const {
6969
return getStateManager().Alloc.identifyKnownAlignedObject<ProgramState>(this);
7070
}
7171

72-
ProgramStateManager::ProgramStateManager(ASTContext &Ctx,
73-
StoreManagerCreator CreateSMgr,
74-
ConstraintManagerCreator CreateCMgr,
75-
std::array<llvm::BumpPtrAllocator, 7> &Allocators,
76-
ExprEngine *ExprEng)
77-
: Eng(ExprEng), EnvMgr(Allocators[0]), GDMFactory(Allocators[1]),
78-
svalBuilder(createSimpleSValBuilder(Allocators[2], Allocators[3], Allocators[4], Ctx, *this)),
79-
CallEventMgr(new CallEventManager(Allocators[5])), Alloc(Allocators[6]) {
72+
ProgramStateManager::ProgramStateManager(
73+
ASTContext &Ctx, StoreManagerCreator CreateSMgr,
74+
ConstraintManagerCreator CreateCMgr,
75+
std::array<llvm::BumpPtrAllocator, 7> &Allocators, ExprEngine *ExprEng)
76+
: Eng(ExprEng), EnvMgr(Allocators[0]), GDMFactory(Allocators[1]),
77+
svalBuilder(createSimpleSValBuilder(Allocators[2], Allocators[3],
78+
Allocators[4], Ctx, *this)),
79+
CallEventMgr(new CallEventManager(Allocators[5])), Alloc(Allocators[6]) {
8080
StoreMgr = (*CreateSMgr)(*this);
8181
ConstraintMgr = (*CreateCMgr)(*this, ExprEng);
8282
}
8383

84-
8584
ProgramStateManager::~ProgramStateManager() {
8685
for (GDMContextsTy::iterator I=GDMContexts.begin(), E=GDMContexts.end();
8786
I!=E; ++I)

clang/lib/StaticAnalyzer/Core/SValBuilder.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,12 @@ void SValBuilder::anchor() {}
5252
SValBuilder::SValBuilder(llvm::BumpPtrAllocator &BasicValueFactoryAllocator,
5353
llvm::BumpPtrAllocator &SymbolManagerAllocator,
5454
llvm::BumpPtrAllocator &MemRegionManagerAllocator,
55-
ASTContext &context,
56-
ProgramStateManager &stateMgr)
55+
ASTContext &context, ProgramStateManager &stateMgr)
5756
: Context(context), BasicVals(context, BasicValueFactoryAllocator),
5857
SymMgr(context, BasicVals, SymbolManagerAllocator),
59-
MemMgr(context, MemRegionManagerAllocator),
60-
StateMgr(stateMgr),
61-
AnOpts(stateMgr.getOwningEngine().getAnalysisManager().getAnalyzerOptions()),
58+
MemMgr(context, MemRegionManagerAllocator), StateMgr(stateMgr),
59+
AnOpts(
60+
stateMgr.getOwningEngine().getAnalysisManager().getAnalyzerOptions()),
6261
ArrayIndexTy(context.LongLongTy),
6362
ArrayIndexWidth(context.getTypeSize(ArrayIndexTy)) {}
6463

clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ class SimpleSValBuilder : public SValBuilder {
6868
llvm::BumpPtrAllocator &SymbolManagerAllocator,
6969
llvm::BumpPtrAllocator &MemRegionManagerAllocator,
7070
ASTContext &context, ProgramStateManager &stateMgr)
71-
: SValBuilder(BasicValueFactoryAllocator,
72-
SymbolManagerAllocator,
73-
MemRegionManagerAllocator,
74-
context, stateMgr) {}
71+
: SValBuilder(BasicValueFactoryAllocator, SymbolManagerAllocator,
72+
MemRegionManagerAllocator, context, stateMgr) {}
7573
~SimpleSValBuilder() override {}
7674

7775
SVal evalBinOpNN(ProgramStateRef state, BinaryOperator::Opcode op,
@@ -103,14 +101,14 @@ class SimpleSValBuilder : public SValBuilder {
103101
};
104102
} // end anonymous namespace
105103

106-
SValBuilder *ento::createSimpleSValBuilder(llvm::BumpPtrAllocator &BasicValueFactoryAllocator,
107-
llvm::BumpPtrAllocator &SymbolManagerAllocator,
108-
llvm::BumpPtrAllocator &MemRegionManagerAllocator,
109-
ASTContext &context, ProgramStateManager &stateMgr) {
104+
SValBuilder *ento::createSimpleSValBuilder(
105+
llvm::BumpPtrAllocator &BasicValueFactoryAllocator,
106+
llvm::BumpPtrAllocator &SymbolManagerAllocator,
107+
llvm::BumpPtrAllocator &MemRegionManagerAllocator, ASTContext &context,
108+
ProgramStateManager &stateMgr) {
110109
return new SimpleSValBuilder(BasicValueFactoryAllocator,
111110
SymbolManagerAllocator,
112-
MemRegionManagerAllocator,
113-
context, stateMgr);
111+
MemRegionManagerAllocator, context, stateMgr);
114112
}
115113

116114
// Checks if the negation the value and flipping sign preserve

clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ void AnalysisConsumer::RunPathSensitiveChecks(Decl *D,
755755
std::array<llvm::BumpPtrAllocator, 7> ProgramStateManagerAllocators;
756756
llvm::BumpPtrAllocator BlockCounterFactoryAllocator;
757757

758-
ExprEngine Eng(CTU, *Mgr, VisitedCallees, &FunctionSummaries, IMode, ProgramStateManagerAllocators, BlockCounterFactoryAllocator);
758+
ExprEngine Eng(CTU, *Mgr, VisitedCallees, &FunctionSummaries, IMode,
759+
ProgramStateManagerAllocators, BlockCounterFactoryAllocator);
759760

760761
// Execute the worklist algorithm.
761762
llvm::TimeRecord ExprEngineStartTime;

0 commit comments

Comments
 (0)