Skip to content

Commit 01088e4

Browse files
author
Martin Mory
committed
Merge branch 'f-ClangTidyIdentifierRenameControlFlow' into f-ClangTidyIdentifierRenameIfdsIdeFFEF
2 parents fb9b1f9 + 6279a2b commit 01088e4

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

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/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

0 commit comments

Comments
 (0)