Skip to content

Commit a9cd897

Browse files
fabianbs96fabianbs96
committed
Merge OpaquePointersIntegration #730 
2 parents 2c04104 + 3848eef commit a9cd897

File tree

97 files changed

+1100
-991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1100
-991
lines changed

‎.github/workflows/ci.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
compiler: [ [clang++-14, clang-14] ]
15+
compiler: [ [clang++-15, clang-15] ]
1616
build: [ Debug, Release, DebugLibdeps ]
1717
include:
1818
- build: Debug
@@ -42,18 +42,18 @@ jobs:
4242
- name: Install Strategy Dependencies
4343
shell: bash
4444
run: |
45-
sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
46-
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
47-
sudo apt-get update
45+
sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key && \
46+
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main' && \
47+
sudo apt-get update && \
4848
sudo apt-get -y install --no-install-recommends \
49-
${{ matrix.compiler[1] }} \
50-
llvm-14-dev \
51-
libllvm14 \
52-
libclang-common-14-dev \
53-
libclang-14-dev \
54-
libclang-cpp14-dev \
55-
clang-tidy-14 \
56-
libclang-rt-14-dev
49+
clang-15 \
50+
llvm-15-dev \
51+
libllvm15 \
52+
libclang-common-15-dev \
53+
libclang-15-dev \
54+
libclang-cpp15-dev \
55+
clang-tidy-15 \
56+
libclang-rt-15-dev
5757
5858
- uses: swift-actions/setup-swift@v2
5959
with:

‎BreakingChanges.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## development HEAD
44

5+
- The `DTAResolver` and the cli option `--call-graph-analysis=dta` do not work anymore (due to opaque pointers) and will be removed for the next release. Please use the `OTF` or `RTA` resolver instead.
6+
- The default type-hierarchy implementation has been changed from `LLVMTypeHierarchy` to `DIBasedTypeHierarchy`. This also requires all affected analyses to be performed on LLVM IR that contains debug information.
57
- Removed the phasar-library `phasar_controller`. It is now part of the tool `phasar-cli`.
68
- The API of the `TypeHierarchy` interface (and thus the `LLVMTypeHierarchy` and `DIBasedTypeHierarchy` as well) has changed:
79
- No handling of the super-type relation (only sub-types)

‎Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ubuntu:22.04
2-
ARG LLVM_INSTALL_DIR="/usr/local/llvm-14"
2+
ARG LLVM_INSTALL_DIR="/usr/local/llvm-15"
33
LABEL Name=phasar Version=2403
44

55
RUN apt -y update && apt install bash sudo -y
@@ -24,17 +24,17 @@ RUN apt-get update && \
2424
apt-get install -y software-properties-common
2525

2626
RUN apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key && \
27-
add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main' && \
27+
add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main' && \
2828
apt-get update && \
2929
apt-get -y install --no-install-recommends \
30-
clang-14 \
31-
llvm-14-dev \
32-
libllvm14 \
33-
libclang-common-14-dev \
34-
libclang-14-dev \
35-
libclang-cpp14-dev \
36-
clang-tidy-14 \
37-
libclang-rt-14-dev
30+
clang-15 \
31+
llvm-15-dev \
32+
libllvm15 \
33+
libclang-common-15-dev \
34+
libclang-15-dev \
35+
libclang-cpp15-dev \
36+
clang-tidy-15 \
37+
libclang-rt-15-dev
3838

3939
RUN pip3 install Pygments pyyaml
4040

@@ -43,8 +43,8 @@ RUN pip3 install Pygments pyyaml
4343
# installing wllvm
4444
RUN pip3 install wllvm
4545

46-
ENV CC=/usr/bin/clang-14
47-
ENV CXX=/usr/bin/clang++-14
46+
ENV CC=/usr/bin/clang-15
47+
ENV CXX=/usr/bin/clang++-15
4848

4949
COPY . /usr/src/phasar
5050

‎bootstrap.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ source ./utils/safeCommandsSet.sh
66

77
readonly PHASAR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
88
PHASAR_INSTALL_DIR="/usr/local/phasar"
9-
LLVM_INSTALL_DIR="/usr/local/llvm-14"
9+
LLVM_INSTALL_DIR="/usr/local/llvm-15"
1010

1111
NUM_THREADS=$(nproc)
12-
LLVM_RELEASE=llvmorg-14.0.6
12+
LLVM_RELEASE=llvmorg-15.0.7
1313
DO_UNIT_TEST=true
1414
DO_INSTALL=false
1515
BUILD_TYPE=Release

‎cmake/phasar_macros.cmake

+1-8
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ function(generate_ll_file)
7676
set(GEN_C_FLAGS -fno-discard-value-names -emit-llvm -S -w)
7777
set(GEN_CMD_COMMENT "[LL]")
7878

79-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
80-
list(APPEND GEN_CXX_FLAGS -Xclang -no-opaque-pointers)
81-
endif()
82-
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
83-
list(APPEND GEN_C_FLAGS -Xclang -no-opaque-pointers)
84-
endif()
85-
8679
if(GEN_LL_MEM2REG)
8780
list(APPEND GEN_CXX_FLAGS -Xclang -disable-O0-optnone)
8881
list(APPEND GEN_C_FLAGS -Xclang -disable-O0-optnone)
@@ -139,7 +132,7 @@ function(generate_ll_file)
139132
add_custom_command(
140133
OUTPUT ${test_code_ll_file}
141134
COMMAND ${GEN_CMD} ${test_code_file_path} -o ${test_code_ll_file}
142-
COMMAND ${CMAKE_CXX_COMPILER_LAUNCHER} ${OPT_TOOL} -mem2reg -S -opaque-pointers=0 ${test_code_ll_file} -o ${test_code_ll_file}
135+
COMMAND ${CMAKE_CXX_COMPILER_LAUNCHER} ${OPT_TOOL} -mem2reg -S ${test_code_ll_file} -o ${test_code_ll_file}
143136
COMMENT ${GEN_CMD_COMMENT}
144137
DEPENDS ${GEN_LL_FILE}
145138
VERBATIM

‎include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class IDESolver
117117
llvm::StringRef(NToString(Cells[I].getRowKey())).trim().str();
118118

119119
std::string NodeStr =
120-
ICF->getFunctionName(ICF->getFunctionOf(Curr)) + "::" + NStr;
120+
ICF->getFunctionName(ICF->getFunctionOf(Curr)).str() + "::" + NStr;
121121
J[DataFlowID][NodeStr];
122122
std::string FactStr =
123123
llvm::StringRef(DToString(Cells[I].getColumnKey())).trim().str();

‎include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@
3333
#include "llvm/IR/Value.h"
3434
#include "llvm/Support/raw_ostream.h"
3535

36-
#include "nlohmann/json.hpp"
37-
38-
#include <memory>
39-
4036
namespace psr {
41-
class LLVMTypeHierarchy;
37+
class DIBasedTypeHierarchy;
4238
class LLVMProjectIRDB;
4339
class Resolver;
4440

@@ -82,7 +78,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
8278
/// IRDB. True by default
8379
explicit LLVMBasedICFG(LLVMProjectIRDB *IRDB, CallGraphAnalysisType CGType,
8480
llvm::ArrayRef<std::string> EntryPoints = {},
85-
LLVMTypeHierarchy *TH = nullptr,
81+
DIBasedTypeHierarchy *TH = nullptr,
8682
LLVMAliasInfoRef PT = nullptr,
8783
Soundness S = Soundness::Soundy,
8884
bool IncludeGlobals = true);
@@ -109,7 +105,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
109105
: LLVMBasedICFG(static_cast<const LLVMProjectIRDB *>(IRDB),
110106
SerializedCG) {}
111107

112-
// Deleter of LLVMTypeHierarchy may be unknown here...
108+
// Deleter of DIBasedTypeHierarchy may be unknown here...
113109
~LLVMBasedICFG();
114110

115111
LLVMBasedICFG(const LLVMBasedICFG &) = delete;

‎include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace llvm {
2020
class Module;
21-
class StructType;
21+
class DIType;
2222
class GlobalVariable;
2323
} // namespace llvm
2424

@@ -30,19 +30,19 @@ class LLVMVFTableProvider {
3030
explicit LLVMVFTableProvider(const llvm::Module &Mod);
3131
explicit LLVMVFTableProvider(const LLVMProjectIRDB &IRDB);
3232

33-
[[nodiscard]] bool hasVFTable(const llvm::StructType *Type) const;
33+
[[nodiscard]] bool hasVFTable(const llvm::DIType *Type) const;
3434
[[nodiscard]] const LLVMVFTable *
35-
getVFTableOrNull(const llvm::StructType *Type) const;
35+
getVFTableOrNull(const llvm::DIType *Type) const;
3636

3737
[[nodiscard]] const llvm::GlobalVariable *
38-
getVFTableGlobal(const llvm::StructType *Type) const;
38+
getVFTableGlobal(const llvm::DIType *Type) const;
3939

4040
[[nodiscard]] const llvm::GlobalVariable *
41-
getVFTableGlobal(const std::string &ClearTypeName) const;
41+
getVFTableGlobal(llvm::StringRef ClearTypeName) const;
4242

4343
private:
44-
std::unordered_map<const llvm::StructType *, LLVMVFTable> TypeVFTMap;
4544
llvm::StringMap<const llvm::GlobalVariable *> ClearNameTVMap;
45+
std::unordered_map<const llvm::DIType *, LLVMVFTable> TypeVFTMap;
4646
};
4747
} // namespace psr
4848

‎include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class Function;
2626
} // namespace llvm
2727

2828
namespace psr {
29-
class LLVMTypeHierarchy;
29+
class DIBasedTypeHierarchy;
3030
class CHAResolver : public Resolver {
3131
public:
3232
CHAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
33-
const LLVMTypeHierarchy *TH);
33+
const DIBasedTypeHierarchy *TH);
3434

3535
// Deleting an incomplete type (LLVMTypeHierarchy) is UB, so instantiate the
3636
// dtor in CHAResolver.cpp
@@ -43,7 +43,7 @@ class CHAResolver : public Resolver {
4343
[[nodiscard]] std::string str() const override;
4444

4545
protected:
46-
MaybeUniquePtr<const LLVMTypeHierarchy, true> TH;
46+
MaybeUniquePtr<const DIBasedTypeHierarchy, true> TH;
4747
};
4848
} // namespace psr
4949

‎include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
2121
#include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
22+
#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
2223
// To switch the TypeGraph
2324
// #include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
2425

@@ -33,7 +34,8 @@ class BitCastInst;
3334

3435
namespace psr {
3536

36-
class DTAResolver : public CHAResolver {
37+
class [[deprecated("Does not work with opaque pointers anymore")]] DTAResolver
38+
: public CHAResolver {
3739
public:
3840
using TypeGraph_t = CachedTypeGraph;
3941

@@ -44,19 +46,20 @@ class DTAResolver : public CHAResolver {
4446
* An heuristic that return true if the bitcast instruction is interesting to
4547
* take into the DTA relational graph
4648
*/
47-
static bool
48-
heuristicAntiConstructorThisType(const llvm::BitCastInst *BitCast);
49+
static bool heuristicAntiConstructorThisType(
50+
const llvm::BitCastInst *BitCast);
4951

5052
/**
5153
* Another heuristic that return true if the bitcast instruction is
5254
* interesting to take into the DTA relational graph (use the presence or not
5355
* of vtable)
56+
5457
*/
5558
bool heuristicAntiConstructorVtablePos(const llvm::BitCastInst *BitCast);
5659

5760
public:
5861
DTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
59-
const LLVMTypeHierarchy *TH);
62+
const DIBasedTypeHierarchy *TH);
6063

6164
~DTAResolver() override = default;
6265

‎include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Value;
3535

3636
namespace psr {
3737

38-
class LLVMTypeHierarchy;
38+
class DIBasedTypeHierarchy;
3939

4040
class OTFResolver : public Resolver {
4141
protected:

‎include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ class CallBase;
2626
class StructType;
2727
class Function;
2828
class StructType;
29+
class DICompositeType;
2930
} // namespace llvm
3031

3132
namespace psr {
33+
class DIBasedTypeHierarchy;
3234
class RTAResolver : public CHAResolver {
3335
public:
3436
RTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
35-
const LLVMTypeHierarchy *TH);
37+
const DIBasedTypeHierarchy *TH);
3638

3739
~RTAResolver() override = default;
3840

@@ -43,9 +45,9 @@ class RTAResolver : public CHAResolver {
4345
[[nodiscard]] std::string str() const override;
4446

4547
private:
46-
void resolveAllocatedStructTypes();
48+
void resolveAllocatedCompositeTypes();
4749

48-
std::vector<const llvm::StructType *> AllocatedStructTypes;
50+
std::vector<const llvm::DICompositeType *> AllocatedCompositeTypes;
4951
};
5052
} // namespace psr
5153

‎include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
2121

2222
#include "llvm/ADT/DenseSet.h"
23+
#include "llvm/IR/DerivedTypes.h"
2324

2425
#include <memory>
2526
#include <optional>
@@ -29,19 +30,19 @@ namespace llvm {
2930
class Instruction;
3031
class CallBase;
3132
class Function;
32-
class StructType;
33+
class DIType;
3334
} // namespace llvm
3435

3536
namespace psr {
3637
class LLVMProjectIRDB;
3738
class LLVMVFTableProvider;
38-
class LLVMTypeHierarchy;
39+
class DIBasedTypeHierarchy;
3940
enum class CallGraphAnalysisType;
4041

4142
[[nodiscard]] std::optional<unsigned>
4243
getVFTIndex(const llvm::CallBase *CallSite);
4344

44-
[[nodiscard]] const llvm::StructType *
45+
[[nodiscard]] const llvm::DIType *
4546
getReceiverType(const llvm::CallBase *CallSite);
4647

4748
[[nodiscard]] std::string getReceiverTypeName(const llvm::CallBase *CallSite);
@@ -57,7 +58,7 @@ class Resolver {
5758
Resolver(const LLVMProjectIRDB *IRDB);
5859

5960
const llvm::Function *
60-
getNonPureVirtualVFTEntry(const llvm::StructType *T, unsigned Idx,
61+
getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
6162
const llvm::CallBase *CallSite);
6263

6364
public:
@@ -91,7 +92,7 @@ class Resolver {
9192
static std::unique_ptr<Resolver> create(CallGraphAnalysisType Ty,
9293
const LLVMProjectIRDB *IRDB,
9394
const LLVMVFTableProvider *VTP,
94-
const LLVMTypeHierarchy *TH,
95+
const DIBasedTypeHierarchy *TH,
9596
LLVMAliasInfoRef PT = nullptr);
9697
};
9798
} // namespace psr

‎include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class StructType;
3232
namespace psr {
3333

3434
class LLVMBasedICFG;
35-
class LLVMTypeHierarchy;
35+
class DIBasedTypeHierarchy;
3636

3737
class InterMonoFullConstantPropagation
3838
: public IntraMonoFullConstantPropagation,
@@ -48,7 +48,7 @@ class InterMonoFullConstantPropagation
4848
using mono_container_t = IntraMonoFullConstantPropagation::mono_container_t;
4949

5050
InterMonoFullConstantPropagation(const LLVMProjectIRDB *IRDB,
51-
const LLVMTypeHierarchy *TH,
51+
const DIBasedTypeHierarchy *TH,
5252
const LLVMBasedICFG *ICF,
5353
LLVMAliasInfoRef PT,
5454
std::vector<std::string> EntryPoints = {});

‎include/phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class StructType;
3636

3737
namespace psr {
3838

39-
class LLVMTypeHierarchy;
39+
class DIBasedTypeHierarchy;
4040

4141
struct InterMonoSolverTestDomain : LLVMAnalysisDomainDefault {
4242
using mono_container_t = BitVectorSet<LLVMAnalysisDomainDefault::d_t>;
@@ -52,8 +52,9 @@ class InterMonoSolverTest : public InterMonoProblem<InterMonoSolverTestDomain> {
5252
using i_t = InterMonoSolverTestDomain::i_t;
5353
using mono_container_t = InterMonoSolverTestDomain::mono_container_t;
5454

55-
InterMonoSolverTest(const LLVMProjectIRDB *IRDB, const LLVMTypeHierarchy *TH,
56-
const LLVMBasedICFG *ICF, LLVMAliasInfoRef PT,
55+
InterMonoSolverTest(const LLVMProjectIRDB *IRDB,
56+
const DIBasedTypeHierarchy *TH, const LLVMBasedICFG *ICF,
57+
LLVMAliasInfoRef PT,
5758
std::vector<std::string> EntryPoints = {});
5859

5960
~InterMonoSolverTest() override = default;

0 commit comments

Comments
 (0)