Skip to content

Commit a38bb90

Browse files
pdschubertpdschubert
committed
too many changes
1 parent 254626b commit a38bb90

17 files changed

Lines changed: 142 additions & 121 deletions

File tree

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

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,6 @@
1010
#ifndef PHASAR_PHASARLLVM_IFDSIDE_PROBLEMS_IDEINSTINTERACTIONALYSIS_H
1111
#define PHASAR_PHASARLLVM_IFDSIDE_PROBLEMS_IDEINSTINTERACTIONALYSIS_H
1212

13-
#include <functional>
14-
#include <initializer_list>
15-
#include <map>
16-
#include <memory>
17-
#include <set>
18-
#include <string>
19-
#include <type_traits>
20-
#include <unordered_map>
21-
#include <unordered_set>
22-
#include <variant>
23-
#include <vector>
24-
25-
#include "llvm/IR/Attributes.h"
26-
#include "llvm/IR/Constant.h"
27-
#include "llvm/IR/Constants.h"
28-
#include "llvm/IR/DerivedTypes.h"
29-
#include "llvm/IR/GlobalVariable.h"
30-
#include "llvm/IR/InstrTypes.h"
31-
#include "llvm/IR/Instruction.h"
32-
#include "llvm/IR/Instructions.h"
33-
#include "llvm/IR/Value.h"
34-
#include "llvm/Support/Casting.h"
35-
#include "llvm/Support/Compiler.h"
36-
#include "llvm/Support/ErrorHandling.h"
37-
3813
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
3914
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
4015
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h"
@@ -52,6 +27,32 @@
5227
#include "phasar/Utils/LLVMShorthands.h"
5328
#include "phasar/Utils/Logger.h"
5429

30+
#include "llvm/IR/Attributes.h"
31+
#include "llvm/IR/Constant.h"
32+
#include "llvm/IR/Constants.h"
33+
#include "llvm/IR/DerivedTypes.h"
34+
#include "llvm/IR/GlobalVariable.h"
35+
#include "llvm/IR/InstrTypes.h"
36+
#include "llvm/IR/Instruction.h"
37+
#include "llvm/IR/Instructions.h"
38+
#include "llvm/IR/Value.h"
39+
#include "llvm/Support/Casting.h"
40+
#include "llvm/Support/Compiler.h"
41+
#include "llvm/Support/ErrorHandling.h"
42+
#include "llvm/Support/raw_ostream.h"
43+
44+
#include <functional>
45+
#include <initializer_list>
46+
#include <map>
47+
#include <memory>
48+
#include <set>
49+
#include <string>
50+
#include <type_traits>
51+
#include <unordered_map>
52+
#include <unordered_set>
53+
#include <variant>
54+
#include <vector>
55+
5556
// have some handy helper functionalities
5657
namespace {
5758

@@ -844,6 +845,7 @@ class IDEInstInteractionAnalysisT
844845
CurrNode,
845846
OnlyConsiderLocalAliases) ||
846847
Store->getPointerOperand() == CurrNode)) {
848+
// Add the original variable, i.e., memory location.
847849
return IIAAKillOrReplaceEF::createEdgeFunction(UserEdgeFacts);
848850
}
849851
// Kill all labels that are propagated along the edge of the

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@
1010
#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDELINEARCONSTANTANALYSIS_H
1111
#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_PROBLEMS_IDELINEARCONSTANTANALYSIS_H
1212

13-
#include <map>
14-
#include <memory>
15-
#include <set>
16-
#include <string>
17-
1813
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
1914
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h"
2015
#include "phasar/PhasarLLVM/Domain/AnalysisDomain.h"
2116
#include "phasar/PhasarLLVM/Utils/LatticeDomain.h"
2217

18+
#include "llvm/Support/raw_ostream.h"
19+
20+
#include <map>
21+
#include <memory>
22+
#include <set>
23+
#include <string>
24+
2325
namespace llvm {
2426
class Instruction;
2527
class Function;

‎include/phasar/PhasarLLVM/Utils/Printer.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* Author: rleer
1515
*/
1616

17-
#ifndef PHASAR_PHASARLLVM_UTILS_PRINTER_H_
18-
#define PHASAR_PHASARLLVM_UTILS_PRINTER_H_
17+
#ifndef PHASAR_PHASARLLVM_UTILS_PRINTER_H
18+
#define PHASAR_PHASARLLVM_UTILS_PRINTER_H
19+
20+
#include "llvm/Support/raw_ostream.h"
1921

20-
#include <ostream>
21-
#include <sstream>
2222
#include <string>
2323

2424
namespace psr {

‎include/phasar/Utils/DebugOutput.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
#ifndef PHASAR_UTILS_DEBUGOUTPUT_H
1010
#define PHASAR_UTILS_DEBUGOUTPUT_H
1111

12-
#include <ostream>
13-
#include <tuple>
14-
#include <type_traits>
15-
#include <utility>
12+
#include "phasar/Utils/LLVMShorthands.h"
13+
#include "phasar/Utils/TypeTraits.h"
1614

1715
#include "llvm/ADT/SmallBitVector.h"
1816
#include "llvm/IR/Type.h"
1917
#include "llvm/Support/raw_os_ostream.h"
2018
#include "llvm/Support/raw_ostream.h"
2119

22-
#include "phasar/Utils/LLVMShorthands.h"
23-
#include "phasar/Utils/TypeTraits.h"
20+
#include <ostream>
21+
#include <tuple>
22+
#include <type_traits>
23+
#include <utility>
2424

2525
namespace psr {
2626
namespace detail {

‎lib/DB/ProjectIRDB.cpp‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@
77
* Philipp Schubert and others
88
*****************************************************************************/
99

10-
#include <algorithm>
11-
#include <cassert>
12-
#include <filesystem>
13-
#include <ostream>
14-
#include <string>
10+
#include "phasar/DB/ProjectIRDB.h"
11+
#include "phasar/Config/Configuration.h"
12+
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
13+
#include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
14+
#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
15+
#include "phasar/Utils/EnumFlags.h"
16+
#include "phasar/Utils/IO.h"
17+
#include "phasar/Utils/LLVMShorthands.h"
18+
#include "phasar/Utils/Logger.h"
19+
#include "phasar/Utils/PAMMMacros.h"
20+
#include "phasar/Utils/Utilities.h"
1521

1622
#include "llvm/Bitcode/BitcodeReader.h"
1723
#include "llvm/Bitcode/BitcodeWriter.h"
@@ -24,19 +30,14 @@
2430
#include "llvm/Linker/Linker.h"
2531
#include "llvm/Support/ErrorHandling.h"
2632
#include "llvm/Support/SourceMgr.h"
33+
#include "llvm/Support/raw_ostream.h"
2734
#include "llvm/Transforms/Utils.h"
2835

29-
#include "phasar/Config/Configuration.h"
30-
#include "phasar/DB/ProjectIRDB.h"
31-
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
32-
#include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
33-
#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
34-
#include "phasar/Utils/EnumFlags.h"
35-
#include "phasar/Utils/IO.h"
36-
#include "phasar/Utils/LLVMShorthands.h"
37-
#include "phasar/Utils/Logger.h"
38-
#include "phasar/Utils/PAMMMacros.h"
39-
#include "phasar/Utils/Utilities.h"
36+
#include <algorithm>
37+
#include <cassert>
38+
#include <filesystem>
39+
#include <ostream>
40+
#include <string>
4041

4142
using namespace std;
4243

‎lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
* @author Sebastian Roland <seroland86@gmail.com>
33
*/
44

5+
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
6+
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
7+
#include "phasar/Utils/LLVMShorthands.h"
8+
9+
#include "llvm/Analysis/PostDominators.h"
10+
#include "llvm/IR/IntrinsicInst.h"
11+
#include "llvm/Support/raw_ostream.h"
12+
513
#include <algorithm>
614
#include <cassert>
715
#include <cstdlib>
@@ -15,13 +23,6 @@
1523
#include <stack>
1624
#include <string>
1725

18-
#include "llvm/Analysis/PostDominators.h"
19-
#include "llvm/IR/IntrinsicInst.h"
20-
21-
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.h"
22-
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/Log.h"
23-
#include "phasar/Utils/LLVMShorthands.h"
24-
2526
using namespace psr;
2627

2728
static const llvm::Value *PoisonPill = // NOLINT

‎lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
* Fabian Schiebel and others
88
*****************************************************************************/
99

10-
#include "llvm/ADT/ArrayRef.h"
11-
#include "llvm/IR/Operator.h"
12-
#include "llvm/Support/raw_os_ostream.h"
13-
#include <cstddef>
14-
1510
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
1611
#include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
1712
#include "phasar/Utils/DebugOutput.h"
1813
#include "phasar/Utils/LLVMShorthands.h"
1914
#include "phasar/Utils/Logger.h"
2015

16+
#include "llvm/ADT/ArrayRef.h"
17+
#include "llvm/IR/Operator.h"
18+
#include "llvm/Support/raw_os_ostream.h"
19+
20+
#include <cstddef>
21+
2122
namespace psr::detail {
2223

2324
AbstractMemoryLocationStorage::AbstractMemoryLocationStorage(

‎lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
* Fabian Schiebel, Alexander Meinhold and others
88
*****************************************************************************/
99

10-
#include <cassert>
10+
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
11+
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
1112

1213
#include "llvm/ADT/APFloat.h"
1314
#include "llvm/IR/Constants.h"
1415
#include "llvm/IR/GlobalVariable.h"
1516
#include "llvm/Support/raw_ostream.h"
1617

17-
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
18-
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValueSet.h"
18+
#include <cassert>
1919

2020
namespace psr {
2121

‎lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
* Fabian Schiebel and others
88
*****************************************************************************/
99

10-
#include <sstream>
11-
12-
#include "llvm/Demangle/Demangle.h"
13-
#include "llvm/IR/GlobalVariable.h"
14-
#include "llvm/IR/InstrTypes.h"
15-
#include "llvm/IR/Instructions.h"
16-
#include "llvm/Support/Casting.h"
17-
#include "llvm/Support/raw_ostream.h"
18-
1910
#include "phasar/DB/ProjectIRDB.h"
2011
#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
2112
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctions.h"
@@ -33,6 +24,15 @@
3324
#include "phasar/Utils/LLVMIRToSrc.h"
3425
#include "phasar/Utils/Logger.h"
3526

27+
#include "llvm/Demangle/Demangle.h"
28+
#include "llvm/IR/GlobalVariable.h"
29+
#include "llvm/IR/InstrTypes.h"
30+
#include "llvm/IR/Instructions.h"
31+
#include "llvm/Support/Casting.h"
32+
#include "llvm/Support/raw_ostream.h"
33+
34+
#include <sstream>
35+
3636
namespace psr {
3737

3838
template <typename Fn, typename = std::enable_if_t<

‎lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@
77
* Philipp Schubert and others
88
*****************************************************************************/
99

10-
#include <algorithm>
11-
#include <utility>
12-
13-
#include "llvm/ADT/DenseMap.h"
14-
#include "llvm/Demangle/Demangle.h"
15-
#include "llvm/IR/AbstractCallSite.h"
16-
#include "llvm/IR/Function.h"
17-
#include "llvm/IR/Instruction.h"
18-
#include "llvm/IR/Value.h"
19-
#include "llvm/Support/ErrorHandling.h"
20-
#include "llvm/Support/raw_ostream.h"
21-
2210
#include "phasar/DB/ProjectIRDB.h"
2311
#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
2412
#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/EdgeFunctionComposer.h"
@@ -33,6 +21,18 @@
3321
#include "phasar/Utils/LLVMShorthands.h"
3422
#include "phasar/Utils/Logger.h"
3523

24+
#include "llvm/ADT/DenseMap.h"
25+
#include "llvm/Demangle/Demangle.h"
26+
#include "llvm/IR/AbstractCallSite.h"
27+
#include "llvm/IR/Function.h"
28+
#include "llvm/IR/Instruction.h"
29+
#include "llvm/IR/Value.h"
30+
#include "llvm/Support/ErrorHandling.h"
31+
#include "llvm/Support/raw_ostream.h"
32+
33+
#include <algorithm>
34+
#include <utility>
35+
3636
using namespace std;
3737
using namespace psr;
3838

0 commit comments

Comments
 (0)