Skip to content

Commit 74296bc

Browse files
pdschubertMartin Mory
pdschubert
and
Martin Mory
authored
clang-tidy fixes of various IFDS/IDE analyses (#473)
Co-authored-by: Martin Mory <linuxfan91@googlemail.com>
1 parent 73936ba commit 74296bc

25 files changed

Lines changed: 653 additions & 638 deletions

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -55,76 +55,76 @@ class IDEProtoAnalysis : public IDETabulationProblem<IDEProtoAnalysisDomain> {
5555

5656
// start formulating our analysis by specifying the parts required for IFDS
5757

58-
FlowFunctionPtrType getNormalFlowFunction(n_t curr, n_t succ) override;
58+
FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
5959

60-
FlowFunctionPtrType getCallFlowFunction(n_t callSite, f_t destFun) override;
60+
FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override;
6161

62-
FlowFunctionPtrType getRetFlowFunction(n_t callSite, f_t calleeFun,
63-
n_t exitInst, n_t retSite) override;
62+
FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeFun,
63+
n_t ExitInst, n_t RetSite) override;
6464

65-
FlowFunctionPtrType getCallToRetFlowFunction(n_t callSite, n_t retSite,
66-
std::set<f_t> callees) override;
65+
FlowFunctionPtrType getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
66+
std::set<f_t> Callees) override;
6767

68-
FlowFunctionPtrType getSummaryFlowFunction(n_t callSite,
69-
f_t destFun) override;
68+
FlowFunctionPtrType getSummaryFlowFunction(n_t CallSite,
69+
f_t DestFun) override;
7070

7171
InitialSeeds<n_t, d_t, l_t> initialSeeds() override;
7272

7373
[[nodiscard]] d_t createZeroValue() const override;
7474

75-
bool isZeroValue(d_t d) const override;
75+
bool isZeroValue(d_t Fact) const override;
7676

7777
// in addition provide specifications for the IDE parts
7878

7979
std::shared_ptr<EdgeFunction<l_t>>
80-
getNormalEdgeFunction(n_t curr, d_t currNode, n_t succ,
81-
d_t succNode) override;
80+
getNormalEdgeFunction(n_t Curr, d_t CurrNode, n_t Succ,
81+
d_t SuccNode) override;
8282

8383
std::shared_ptr<EdgeFunction<l_t>>
84-
getCallEdgeFunction(n_t callSite, d_t srcNode, f_t destinationFunction,
85-
d_t destNode) override;
84+
getCallEdgeFunction(n_t CallSite, d_t SrcNode, f_t DestinationFunction,
85+
d_t DestNode) override;
8686

8787
std::shared_ptr<EdgeFunction<l_t>>
88-
getReturnEdgeFunction(n_t callSite, f_t calleeFunction, n_t exitInst,
89-
d_t exitNode, n_t reSite, d_t retNode) override;
88+
getReturnEdgeFunction(n_t CallSite, f_t CalleeFunction, n_t ExitInst,
89+
d_t ExitNode, n_t RetSite, d_t RetNode) override;
9090

9191
std::shared_ptr<EdgeFunction<l_t>>
92-
getCallToRetEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
93-
d_t retSiteNode, std::set<f_t> callees) override;
92+
getCallToRetEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
93+
d_t RetSiteNode, std::set<f_t> Callees) override;
9494

9595
std::shared_ptr<EdgeFunction<l_t>>
96-
getSummaryEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
97-
d_t retSiteNode) override;
96+
getSummaryEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
97+
d_t RetSiteNode) override;
9898

9999
l_t topElement() override;
100100

101101
l_t bottomElement() override;
102102

103-
l_t join(l_t lhs, l_t rhs) override;
103+
l_t join(l_t Lhs, l_t Rhs) override;
104104

105105
std::shared_ptr<EdgeFunction<l_t>> allTopFunction() override;
106106

107107
class IDEProtoAnalysisAllTop
108108
: public EdgeFunction<l_t>,
109109
public std::enable_shared_from_this<IDEProtoAnalysisAllTop> {
110-
l_t computeTarget(l_t source) override;
110+
l_t computeTarget(l_t Source) override;
111111

112112
std::shared_ptr<EdgeFunction<l_t>>
113-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
113+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
114114

115115
std::shared_ptr<EdgeFunction<l_t>>
116-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
116+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
117117

118-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
118+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
119119
};
120120

121-
void printNode(std::ostream &os, n_t n) const override;
121+
void printNode(std::ostream &OS, n_t Stmt) const override;
122122

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

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

127-
void printEdgeFact(std::ostream &os, l_t l) const override;
127+
void printEdgeFact(std::ostream &OS, l_t L) const override;
128128
};
129129

130130
} // namespace psr

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

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ struct IDESecureHeapPropagationAnalysisDomain : LLVMAnalysisDomainDefault {
3939
class IDESecureHeapPropagation
4040
: public IDETabulationProblem<IDESecureHeapPropagationAnalysisDomain> {
4141

42-
const llvm::StringLiteral initializerFn = "CRYPTO_secure_malloc_init";
43-
const llvm::StringLiteral shutdownFn = "CRYPTO_secure_malloc_done";
42+
const llvm::StringLiteral InitializerFn = "CRYPTO_secure_malloc_init";
43+
const llvm::StringLiteral ShutdownFn = "CRYPTO_secure_malloc_done";
4444

4545
public:
4646
using IDETabProblemType =
@@ -58,107 +58,107 @@ class IDESecureHeapPropagation
5858
std::set<std::string> EntryPoints = {"main"});
5959
~IDESecureHeapPropagation() override = default;
6060

61-
FlowFunctionPtrType getNormalFlowFunction(n_t curr, n_t succ) override;
61+
FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
6262

63-
FlowFunctionPtrType getCallFlowFunction(n_t callSite, f_t destMthd) override;
63+
FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFunc) override;
6464

65-
FlowFunctionPtrType getRetFlowFunction(n_t callSite, f_t calleeMthd,
66-
n_t exitInst, n_t retSite) override;
65+
FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeMthd,
66+
n_t ExitInst, n_t RetSite) override;
6767

68-
FlowFunctionPtrType getCallToRetFlowFunction(n_t callSite, n_t retSite,
69-
std::set<f_t> callees) override;
68+
FlowFunctionPtrType getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
69+
std::set<f_t> Callees) override;
7070

71-
FlowFunctionPtrType getSummaryFlowFunction(n_t callSite,
72-
f_t destMthd) override;
71+
FlowFunctionPtrType getSummaryFlowFunction(n_t CallSite,
72+
f_t DestMthd) override;
7373

7474
InitialSeeds<n_t, d_t, l_t> initialSeeds() override;
7575

7676
[[nodiscard]] d_t createZeroValue() const override;
7777

78-
bool isZeroValue(d_t d) const override;
78+
[[nodiscard]] bool isZeroValue(d_t Fact) const override;
7979

80-
void printNode(std::ostream &os, n_t n) const override;
80+
void printNode(std::ostream &OS, n_t Stmt) const override;
8181

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

84-
void printFunction(std::ostream &os, f_t f) const override;
84+
void printFunction(std::ostream &OS, f_t Func) const override;
8585

8686
// in addition provide specifications for the IDE parts
8787

8888
std::shared_ptr<EdgeFunction<l_t>>
89-
getNormalEdgeFunction(n_t curr, d_t currNode, n_t succ,
90-
d_t succNode) override;
89+
getNormalEdgeFunction(n_t Curr, d_t CurrNode, n_t Succ,
90+
d_t SuccNode) override;
9191

92-
std::shared_ptr<EdgeFunction<l_t>> getCallEdgeFunction(n_t callSite,
93-
d_t srcNode,
94-
f_t destinationMethod,
95-
d_t destNode) override;
92+
std::shared_ptr<EdgeFunction<l_t>> getCallEdgeFunction(n_t CallSite,
93+
d_t SrcNode,
94+
f_t DestinationMethod,
95+
d_t DestNode) override;
9696

9797
std::shared_ptr<EdgeFunction<l_t>>
98-
getReturnEdgeFunction(n_t callSite, f_t calleeMethod, n_t exitInst,
99-
d_t exitNode, n_t reSite, d_t retNode) override;
98+
getReturnEdgeFunction(n_t CallSite, f_t CalleeMethod, n_t ExitInst,
99+
d_t ExitNode, n_t RetSite, d_t RetNode) override;
100100

101101
std::shared_ptr<EdgeFunction<l_t>>
102-
getCallToRetEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
103-
d_t retSiteNode, std::set<f_t> callees) override;
102+
getCallToRetEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
103+
d_t RetSiteNode, std::set<f_t> Callees) override;
104104

105105
std::shared_ptr<EdgeFunction<l_t>>
106-
getSummaryEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
107-
d_t retSiteNode) override;
106+
getSummaryEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
107+
d_t RetSiteNode) override;
108108

109109
l_t topElement() override;
110110

111111
l_t bottomElement() override;
112112

113-
l_t join(l_t lhs, l_t rhs) override;
113+
l_t join(l_t Lhs, l_t Rhs) override;
114114

115115
std::shared_ptr<EdgeFunction<l_t>> allTopFunction() override;
116116

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

119119
void emitTextReport(const SolverResults<n_t, d_t, l_t> &SR,
120-
std::ostream &os) override;
120+
std::ostream &OS) override;
121121

122122
struct SHPEdgeFn : public EdgeFunction<l_t>,
123123
public std::enable_shared_from_this<SHPEdgeFn> {
124124
~SHPEdgeFn() override = default;
125125

126126
std::shared_ptr<EdgeFunction<l_t>>
127-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
127+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
128128
};
129129

130130
struct SHPEdgeFunctionComposer
131131
: public EdgeFunctionComposer<l_t>,
132132
public std::enable_shared_from_this<SHPEdgeFn> {
133133
~SHPEdgeFunctionComposer() override = default;
134134
std::shared_ptr<EdgeFunction<l_t>>
135-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
135+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
136136
};
137137
struct SHPGenEdgeFn : public SHPEdgeFn {
138-
SHPGenEdgeFn(l_t val);
138+
SHPGenEdgeFn(l_t Val);
139139
~SHPGenEdgeFn() override = default;
140140

141-
l_t computeTarget(l_t source) override;
141+
l_t computeTarget(l_t Source) override;
142142

143-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
143+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
144144
std::shared_ptr<EdgeFunction<l_t>>
145-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
146-
void print(std::ostream &OS, bool isForDebug = false) const override;
147-
static std::shared_ptr<SHPGenEdgeFn> getInstance(l_t val);
145+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
146+
void print(std::ostream &OS, bool IsForDebug = false) const override;
147+
static std::shared_ptr<SHPGenEdgeFn> getInstance(l_t Val);
148148

149149
private:
150-
l_t value;
150+
l_t Value;
151151
};
152152

153153
struct IdentityEdgeFunction : public SHPEdgeFn {
154154
~IdentityEdgeFunction() override = default;
155155

156-
l_t computeTarget(l_t source) override;
156+
l_t computeTarget(l_t Source) override;
157157
std::shared_ptr<EdgeFunction<l_t>>
158-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
159-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
158+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
159+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
160160

161-
void print(std::ostream &OS, bool isForDebug = false) const override;
161+
void print(std::ostream &OS, bool IsForDebug = false) const override;
162162

163163
static std::shared_ptr<IdentityEdgeFunction> getInstance();
164164
};

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,76 +58,76 @@ class IDESolverTest : public IDETabulationProblem<IDESolverTestAnalysisDomain> {
5858

5959
// start formulating our analysis by specifying the parts required for IFDS
6060

61-
FlowFunctionPtrType getNormalFlowFunction(n_t curr, n_t succ) override;
61+
FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
6262

63-
FlowFunctionPtrType getCallFlowFunction(n_t callSite, f_t destFun) override;
63+
FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override;
6464

65-
FlowFunctionPtrType getRetFlowFunction(n_t callSite, f_t calleeFun,
66-
n_t exitInst, n_t retSite) override;
65+
FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeFun,
66+
n_t ExitStmt, n_t RetSite) override;
6767

68-
FlowFunctionPtrType getCallToRetFlowFunction(n_t callSite, n_t retSite,
69-
std::set<f_t> callees) override;
68+
FlowFunctionPtrType getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
69+
std::set<f_t> Callees) override;
7070

71-
FlowFunctionPtrType getSummaryFlowFunction(n_t callSite,
72-
f_t destFun) override;
71+
FlowFunctionPtrType getSummaryFlowFunction(n_t CallSite,
72+
f_t DestFun) override;
7373

7474
InitialSeeds<n_t, d_t, l_t> initialSeeds() override;
7575

7676
[[nodiscard]] d_t createZeroValue() const override;
7777

78-
bool isZeroValue(d_t d) const override;
78+
[[nodiscard]] bool isZeroValue(d_t Fact) const override;
7979

8080
// in addition provide specifications for the IDE parts
8181

8282
std::shared_ptr<EdgeFunction<l_t>>
83-
getNormalEdgeFunction(n_t curr, d_t currNode, n_t succ,
84-
d_t succNode) override;
83+
getNormalEdgeFunction(n_t Curr, d_t CurrNode, n_t Succ,
84+
d_t SuccNode) override;
8585

8686
std::shared_ptr<EdgeFunction<l_t>>
87-
getCallEdgeFunction(n_t callSite, d_t srcNode, f_t destinationFunction,
88-
d_t destNode) override;
87+
getCallEdgeFunction(n_t CallSite, d_t SrcNode, f_t DestinationFunction,
88+
d_t DestNode) override;
8989

9090
std::shared_ptr<EdgeFunction<l_t>>
91-
getReturnEdgeFunction(n_t callSite, f_t calleeFunction, n_t exitInst,
92-
d_t exitNode, n_t reSite, d_t retNode) override;
91+
getReturnEdgeFunction(n_t CallSite, f_t CalleeFunction, n_t ExitStmt,
92+
d_t ExitNode, n_t RetSite, d_t RetNode) override;
9393

9494
std::shared_ptr<EdgeFunction<l_t>>
95-
getCallToRetEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
96-
d_t retSiteNode, std::set<f_t> callees) override;
95+
getCallToRetEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
96+
d_t RetSiteNode, std::set<f_t> Callees) override;
9797

9898
std::shared_ptr<EdgeFunction<l_t>>
99-
getSummaryEdgeFunction(n_t callSite, d_t callNode, n_t retSite,
100-
d_t retSiteNode) override;
99+
getSummaryEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
100+
d_t RetSiteNode) override;
101101

102102
l_t topElement() override;
103103

104104
l_t bottomElement() override;
105105

106-
l_t join(l_t lhs, l_t rhs) override;
106+
l_t join(l_t Lhs, l_t Rhs) override;
107107

108108
std::shared_ptr<EdgeFunction<l_t>> allTopFunction() override;
109109

110110
class IDESolverTestAllTop
111111
: public EdgeFunction<l_t>,
112112
public std::enable_shared_from_this<IDESolverTestAllTop> {
113-
l_t computeTarget(l_t source) override;
113+
l_t computeTarget(l_t Source) override;
114114

115115
std::shared_ptr<EdgeFunction<l_t>>
116-
composeWith(std::shared_ptr<EdgeFunction<l_t>> secondFunction) override;
116+
composeWith(std::shared_ptr<EdgeFunction<l_t>> SecondFunction) override;
117117

118118
std::shared_ptr<EdgeFunction<l_t>>
119-
joinWith(std::shared_ptr<EdgeFunction<l_t>> otherFunction) override;
119+
joinWith(std::shared_ptr<EdgeFunction<l_t>> OtherFunction) override;
120120

121-
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> other) const override;
121+
bool equal_to(std::shared_ptr<EdgeFunction<l_t>> Other) const override;
122122
};
123123

124-
void printNode(std::ostream &os, n_t n) const override;
124+
void printNode(std::ostream &OS, n_t Stmt) const override;
125125

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

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

130-
void printEdgeFact(std::ostream &os, l_t l) const override;
130+
void printEdgeFact(std::ostream &OS, l_t L) const override;
131131
};
132132

133133
} // namespace psr

0 commit comments

Comments
 (0)