Skip to content

Commit 7f3549c

Browse files
pdschubertpdschubert
authored
Merge pull request #459 from secure-software-engineering/f-ClangTidyFixIDETSA
clang-tidy: Fix IDE TSA
2 parents 85555d3 + 939c79a commit 7f3549c

10 files changed

Lines changed: 185 additions & 182 deletions

File tree

‎include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -111,46 +111,46 @@ class IDETypeStateAnalysis
111111

112112
// start formulating our analysis by specifying the parts required for IFDS
113113

114-
FlowFunctionPtrType getNormalFlowFunction(n_t curr, n_t succ) override;
114+
FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
115115

116-
FlowFunctionPtrType getCallFlowFunction(n_t callSite, f_t destFun) override;
116+
FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override;
117117

118-
FlowFunctionPtrType getRetFlowFunction(n_t callSite, f_t calleeFun,
119-
n_t exitInst, n_t retSite) override;
118+
FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeFun,
119+
n_t ExitStmt, n_t RetSite) override;
120120

121-
FlowFunctionPtrType getCallToRetFlowFunction(n_t callSite, n_t retSite,
122-
std::set<f_t> callees) override;
121+
FlowFunctionPtrType getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
122+
std::set<f_t> Callees) override;
123123

124-
FlowFunctionPtrType getSummaryFlowFunction(n_t callSite,
125-
f_t destFun) override;
124+
FlowFunctionPtrType getSummaryFlowFunction(n_t CallSite,
125+
f_t DestFun) override;
126126

127127
InitialSeeds<n_t, d_t, l_t> initialSeeds() override;
128128

129129
[[nodiscard]] d_t createZeroValue() const override;
130130

131-
bool isZeroValue(d_t d) const override;
131+
[[nodiscard]] bool isZeroValue(d_t Fact) const override;
132132

133133
// in addition provide specifications for the IDE parts
134134

135135
std::shared_ptr<EdgeFunction<l_t>>
136-
getNormalEdgeFunction(n_t curr, d_t currNode, n_t succ,
137-
d_t succNode) override;
136+
getNormalEdgeFunction(n_t Curr, d_t CurrNode, n_t Succ,
137+
d_t SuccNode) override;
138138

139139
std::shared_ptr<EdgeFunction<l_t>>
140-
getCallEdgeFunction(n_t callSite, d_t srcNode, f_t destinationFunction,
141-
d_t destNode) override;
140+
getCallEdgeFunction(n_t CallSite, d_t SrcNode, f_t DestinationFunction,
141+
d_t DestNode) override;
142142

143143
std::shared_ptr<EdgeFunction<l_t>>
144-
getReturnEdgeFunction(n_t callSite, f_t calleeFunction, n_t exitInst,
145-
d_t exitNode, n_t reSite, d_t retNode) override;
144+
getReturnEdgeFunction(n_t CallSite, f_t CalleeFunction, n_t ExitInst,
145+
d_t ExitNode, n_t RetSite, d_t RetNode) override;
146146

147147
std::shared_ptr<EdgeFunction<l_t>>
148-
getCallToRetEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
149-
d_t retSiteNode, std::set<f_t> callees) override;
148+
getCallToRetEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
149+
d_t RetSiteNode, std::set<f_t> Callees) override;
150150

151151
std::shared_ptr<EdgeFunction<l_t>>
152-
getSummaryEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
153-
d_t retSiteNode) override;
152+
getSummaryEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
153+
d_t RetSiteNode) override;
154154

155155
l_t topElement() override;
156156

@@ -164,32 +164,33 @@ class IDETypeStateAnalysis
164164
*
165165
* @note Only one-level lattice's are handled currently
166166
*/
167-
l_t join(l_t lhs, l_t rhs) override;
167+
l_t join(l_t Lhs, l_t Rhs) override;
168168

169169
std::shared_ptr<EdgeFunction<l_t>> allTopFunction() override;
170170

171-
void printNode(std::ostream &os, n_t N) const override;
171+
void printNode(std::ostream &OS, n_t Stmt) const override;
172172

173-
void printDataFlowFact(std::ostream &os, d_t d) const override;
173+
void printDataFlowFact(std::ostream &OS, d_t Fact) const override;
174174

175-
void printFunction(std::ostream &os, f_t m) const override;
175+
void printFunction(std::ostream &OS, f_t Func) const override;
176176

177-
void printEdgeFact(std::ostream &os, l_t l) const override;
177+
void printEdgeFact(std::ostream &OS, l_t L) const override;
178178

179179
void emitTextReport(const SolverResults<n_t, d_t, l_t> &SR,
180180
std::ostream &OS = std::cout) override;
181181

182182
// customize the edge function composer
183183
class TSEdgeFunctionComposer : public EdgeFunctionComposer<l_t> {
184184
private:
185-
l_t botElement;
185+
l_t BotElement;
186186

187187
public:
188188
TSEdgeFunctionComposer(std::shared_ptr<EdgeFunction<l_t>> F,
189-
std::shared_ptr<EdgeFunction<l_t>> G, l_t bot)
190-
: EdgeFunctionComposer<l_t>(F, G), botElement(bot){};
189+
std::shared_ptr<EdgeFunction<l_t>> G, l_t Bot)
190+
: EdgeFunctionComposer<l_t>(F, G), BotElement(Bot) {}
191+
191192
std::shared_ptr<EdgeFunction<l_t>>
192-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
193+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
193194
};
194195

195196
class TSEdgeFunction : public EdgeFunction<l_t>,
@@ -202,21 +203,21 @@ class IDETypeStateAnalysis
202203
const llvm::CallBase *CallSite;
203204

204205
public:
205-
TSEdgeFunction(const TypeStateDescription &tsd, const std::string tok,
206-
const llvm::CallBase *cb)
207-
: TSD(tsd), Token(tok), CallSite(cb){};
206+
TSEdgeFunction(const TypeStateDescription &TSD, const std::string &Tok,
207+
const llvm::CallBase *CB)
208+
: TSD(TSD), Token(Tok), CallSite(CB){};
208209

209-
l_t computeTarget(l_t source) override;
210+
l_t computeTarget(l_t Source) override;
210211

211212
std::shared_ptr<EdgeFunction<l_t>>
212-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
213+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
213214

214215
std::shared_ptr<EdgeFunction<l_t>>
215-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
216+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
216217

217-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
218+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
218219

219-
void print(std::ostream &OS, bool isForDebug = false) const override;
220+
void print(std::ostream &OS, bool IsForDebug = false) const override;
220221
};
221222
class TSConstant : public EdgeFunction<l_t>,
222223
public std::enable_shared_from_this<TSConstant> {
@@ -226,17 +227,17 @@ class IDETypeStateAnalysis
226227
public:
227228
TSConstant(const TypeStateDescription &TSD, l_t State);
228229

229-
l_t computeTarget(l_t source) override;
230+
l_t computeTarget(l_t Source) override;
230231

231232
std::shared_ptr<EdgeFunction<l_t>>
232-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
233+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
233234

234235
std::shared_ptr<EdgeFunction<l_t>>
235-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
236+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
236237

237-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
238+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
238239

239-
void print(std::ostream &OS, bool isForDebug = false) const override;
240+
void print(std::ostream &OS, bool IsForDebug = false) const override;
240241
};
241242
};
242243

‎include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,17 @@ class OpenSSLEVPKDFCTXDescription : public TypeStateDescription {
7272

7373
// std::map<std::pair<const llvm::Instruction *, const llvm::Value *>, int>
7474
// requiredKDFState;
75-
IDESolver<IDETypeStateAnalysisDomain> &kdfAnalysisResults;
75+
IDESolver<IDETypeStateAnalysisDomain> &KDFAnalysisResults;
7676
static OpenSSLEVTKDFToken funcNameToToken(const std::string &F);
7777

7878
public:
7979
OpenSSLEVPKDFCTXDescription(
80-
IDESolver<IDETypeStateAnalysisDomain> &kdfAnalysisResults)
81-
: kdfAnalysisResults(kdfAnalysisResults) {}
82-
[[nodiscard]] bool isFactoryFunction(const std::string &F) const override;
83-
[[nodiscard]] bool isConsumingFunction(const std::string &F) const override;
84-
[[nodiscard]] bool isAPIFunction(const std::string &F) const override;
80+
IDESolver<IDETypeStateAnalysisDomain> &KDFAnalysisResults)
81+
: KDFAnalysisResults(KDFAnalysisResults) {}
82+
83+
[[nodiscard]] bool isFactoryFunction(const std::string &FuncName) const override;
84+
[[nodiscard]] bool isConsumingFunction(const std::string &FuncName) const override;
85+
[[nodiscard]] bool isAPIFunction(const std::string &FuncName) const override;
8586
[[nodiscard]] TypeStateDescription::State
8687
getNextState(std::string Tok, TypeStateDescription::State S) const override;
8788
[[nodiscard]] TypeStateDescription::State

‎include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ class OpenSSLSecureHeapDescription : public TypeStateDescription {
4646
static const OpenSSLSecureHeapState Delta[5][6];
4747

4848
IDESolver<IDESecureHeapPropagationAnalysisDomain>
49-
&secureHeapPropagationResults;
49+
&SecureHeapPropagationResults;
5050

5151
static OpenSSLSecureHeapToken funcNameToToken(const std::string &F);
5252

5353
public:
5454
OpenSSLSecureHeapDescription(IDESolver<IDESecureHeapPropagationAnalysisDomain>
55-
&secureHeapPropagationResults);
55+
&SecureHeapPropagationResults);
5656

5757
[[nodiscard]] bool isFactoryFunction(const std::string &F) const override;
5858
[[nodiscard]] bool isConsumingFunction(const std::string &F) const override;

0 commit comments

Comments
 (0)