Skip to content

Commit 826cc9b

Browse files
author
Martin Mory
committed
Merge branch 'f-ClangTidyFixIDEXTaint' into f-ClangTidyFixIDEGeneralizedLCA
2 parents 17dfddd + 06a3c23 commit 826cc9b

9 files changed

Lines changed: 15 additions & 12 deletions

File tree

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ class MapTaintedValuesToCaller : public FlowFunction<ExtendedValue> {
2020
MapTaintedValuesToCaller(const llvm::CallInst *CallInst,
2121
const llvm::ReturnInst *RetInst,
2222
TraceStats &TraceStats, const ExtendedValue &ZV)
23-
: CallInst(CallInst), RetInst(RetInst), TraceStats(TraceStats),
24-
ZV(ZV) {}
23+
: CallInst(CallInst), RetInst(RetInst), TraceStats(TraceStats), ZV(ZV) {}
2524
~MapTaintedValuesToCaller() override = default;
2625

2726
std::set<ExtendedValue> computeTargets(ExtendedValue Fact) override;

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
#define LOG_INFO(x) \
1111
do { \
1212
llvm::outs() << "[ENV_TRACE] " << x << "\n"; /*NOLINT*/ \
13-
\
14-
llvm::outs() \
15-
.flush(); \
13+
\
14+
llvm::outs().flush(); \
1615
} while (0)
1716

1817
#ifdef DEBUG_BUILD

include/phasar/PhasarLLVM/DataFlowSolver/Mono/Contexts/CallStringCTX.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ template <typename N, unsigned K> struct hash<psr::CallStringCTX<N, K>> {
9999

100100
} // namespace std
101101

102-
#endif
102+
#endif

lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Resolver::Resolver(ProjectIRDB &IRDB, LLVMTypeHierarchy &TH)
7777

7878
const llvm::Function *
7979
Resolver::getNonPureVirtualVFTEntry(const llvm::StructType *T, unsigned Idx,
80-
const llvm::CallBase */*CallSite*/) {
80+
const llvm::CallBase * /*CallSite*/) {
8181
if (TH && TH->hasVFTable(T)) {
8282
const auto *Target = TH->getVFTable(T)->getFunction(Idx);
8383
if (Target && Target->getName() != "__cxa_pure_virtual") {

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ namespace psr::XTaint {
1818
ComposeEdgeFunction::ComposeEdgeFunction(BasicBlockOrdering &BBO,
1919
EdgeFunctionPtrType F,
2020
EdgeFunctionPtrType G)
21-
: EdgeFunctionBase(EFKind::Compose, BBO), F(std::move(F)), G(std::move(G)) {}
21+
: EdgeFunctionBase(EFKind::Compose, BBO), F(std::move(F)), G(std::move(G)) {
22+
}
2223

2324
auto ComposeEdgeFunction::computeTarget(l_t Source) -> l_t {
2425
return G->computeTarget(F->computeTarget(Source));

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/JoinEdgeFunction.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ namespace psr::XTaint {
2323
JoinEdgeFunction::JoinEdgeFunction(BasicBlockOrdering &BBO,
2424
SubEdgeFuctionsTy &&SubEF,
2525
const EdgeDomain &Seed)
26-
: EdgeFunctionBase(EFKind::Join, BBO), SubEF(std::move(SubEF)), Seed(Seed) {}
26+
: EdgeFunctionBase(EFKind::Join, BBO), SubEF(std::move(SubEF)), Seed(Seed) {
27+
}
2728
JoinEdgeFunction::JoinEdgeFunction(
2829
BasicBlockOrdering &BBO, std::initializer_list<EdgeFunctionPtrType> SubEF,
2930
const EdgeDomain &Seed)

lib/PhasarLLVM/Plugins/IDETabulationProblemTestPlugin.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,5 @@ makeIDETabulationProblemtestPlugin(const ProjectIRDB *IRDB,
8484
std::set<std::string> EntryPoints);
8585

8686
} // namespace psr
87-
#endif
87+
88+
#endif

unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@ TEST(LLVMBasedICFGGlobCtorDtorTest, LCATest5) {
455455

456456
IDESolver Solver(Problem);
457457

458-
const auto *GlobalDtor = ICFG.getRegisteredDtorsCallerOrNull(IRDB.getWPAModule());
458+
const auto *GlobalDtor =
459+
ICFG.getRegisteredDtorsCallerOrNull(IRDB.getWPAModule());
459460

460461
ASSERT_NE(nullptr, GlobalDtor);
461462

unittests/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionSingletonFactoryTest.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ struct TestEdgeFunction
1919

2020
int computeTarget(int /*Source*/) override { return 42; }
2121

22-
EdgeFunctionPtrType composeWith(EdgeFunctionPtrType /*SecondFunction*/) override {
22+
EdgeFunctionPtrType
23+
composeWith(EdgeFunctionPtrType /*SecondFunction*/) override {
2324
return this->shared_from_this();
2425
};
2526

0 commit comments

Comments
 (0)