Skip to content

Commit 9b8810b

Browse files
author
Martin Mory
committed
Merge branch 'development'
2 parents 495fd38 + c484261 commit 9b8810b

File tree

334 files changed

+10472
-14058
lines changed

Some content is hidden

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

334 files changed

+10472
-14058
lines changed

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Checks: '-*,
1515
-readability-function-cognitive-complexity,
1616
-readability-convert-member-functions-to-static,
1717
-readability-isolate-declaration,
18+
-readability-identifier-length,
1819
cppcoreguidelines-*,
1920
-cppcoreguidelines-avoid-non-const-global-variables,
2021
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
@@ -28,7 +29,6 @@ Checks: '-*,
2829
-bugprone-easily-swappable-parameters,
2930
modernize-*,
3031
-modernize-use-trailing-return-type,
31-
-modernize-pass-by-value,
3232
performance-*,
3333
clang-analyzer-*,
3434
'

.github/CODEOWNERS

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Patterns listed later take precedence over earlier patterns.
2+
# All owners are automatically set as reviewers for PRs affecting their files.
3+
# At least one owner must approve a PR affecting their files.
4+
5+
* @MMory @fabianbs96
6+
7+
/include/phasar/PhasarLLVM/DataflowSolver/IfdsIde/Solver/IDESolver.h @pdschubert
8+
9+
/include/phasar/PhasarLLVM/DataflowSolver/IfdsIde/FlowEdgeFunctionCache.h @vulder
10+
11+
/include/phasar/PhasarLLVM/DataflowSolver/Mono @pdschubert
12+
13+
/img @pdschubert
14+
15+
/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h @pdschubert @vulder
16+
/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
17+
/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.h @fabianbs96
18+
/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp @fabianbs96
19+
/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/ @fabianbs96
20+
21+
/include/phasar/PhasarLLVM/AnalysisStrategy/ @pdschubert
22+
23+
Dockerfile @janniclas
24+
/.docker/ @janniclas
25+
26+
/include/phasar/Utils/Logger.h @MMory

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ endif()
125125
find_package(Threads)
126126

127127
# Boost
128-
find_package(Boost 1.65.1 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
129-
#find_package(Boost 1.72.0 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
128+
find_package(Boost 1.65.1 COMPONENTS graph ${BOOST_THREAD} REQUIRED)
129+
#find_package(Boost 1.72.0 COMPONENTS graph ${BOOST_THREAD} REQUIRED)
130130
include_directories(${Boost_INCLUDE_DIRS})
131131

132132
# Disable clang-tidy for the external projects

CREDITS.txt

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,36 @@ This file is a partial list of people who have contributed to Phasar
22

33
The fields are: name (N), email (E), web-address (W), description (D)
44

5+
6+
Active Contributors:
7+
58
N: Philipp Schubert
69
710
W: http://it-schubert.com
8-
D: Initial implementation and chief developer new features
11+
D: Initial implementation, high-level architecture, IDESolver, InstInteractionAnalysis
912

1013
N: Martin Mory
1114
12-
D: CMake
15+
D: CMake, Logger, Organization
1316

14-
N: Nicolas Bellec
15-
16-
D: Call-graph algorithms
17+
N: Fabian Schiebel
18+
19+
D: ExtendedTaintAnalysis, general development, Organization
20+
21+
N: Jan-Niclas Strüwer
22+
23+
D: ESG visualization adaptor, Docker, Mac Support
1724

1825
N: Florian Sattler
1926
20-
D: CMake and CMake build as llvm drop-in
27+
D: CMake and CMake build as llvm drop-in, CI/CD Pipeline, Performance, InstInteractionAnalysis
28+
29+
30+
Former Contributors:
31+
32+
N: Nicolas Bellec
33+
34+
D: Call-graph algorithms
2135

2236
N: Christian Stritzke
2337
@@ -26,7 +40,3 @@ D: HexaStore implementation
2640
N: Richard Leer
2741
2842
D: Serialization, various fixes and data-flow analyses
29-
30-
N: Jan-Niclas Strüwer
31-
32-
D: ESG visualization adaptor

Config.cmake.in

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,47 @@ set(PHASAR_VERSION 1.0.0)
33
@PACKAGE_INIT@
44
set_and_check(PHASAR_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
55

6-
foreach(component ${phasar_FIND_COMPONENTS})
7-
include("${CMAKE_CURRENT_LIST_DIR}/phasar_${component}-config.cmake")
6+
include (CMakeFindDependencyMacro)
7+
find_dependency(nlohmann_json)
8+
find_dependency(nlohmann_json_schema_validator)
9+
find_package(Boost 1.65.1 COMPONENTS program_options graph REQUIRED)
10+
11+
# TODO: The order seems to be important. Fix this!
12+
13+
set(PHASAR_COMPONENTS
14+
utils
15+
config
16+
phasarllvm_utils
17+
passes
18+
db
19+
pointer
20+
typehierarchy
21+
controlflow
22+
taintconfig
23+
ifdside
24+
)
25+
26+
foreach(component ${PHASAR_COMPONENTS})
827
include("${CMAKE_CURRENT_LIST_DIR}/phasar_${component}-targets.cmake")
28+
list(APPEND PHASAR_NEEDED_LIBS phasar::phasar_${component})
929
endforeach()
1030

31+
list(REMOVE_DUPLICATES PHASAR_NEEDED_LIBS)
32+
33+
find_package(LLVM 14 REQUIRED CONFIG)
34+
include_directories(${LLVM_INCLUDE_DIRS})
35+
link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
36+
find_library(LLVM_LIBRARY NAMES LLVM HINTS ${LLVM_LIBRARY_DIRS})
37+
1138
function(phasar_config executable)
12-
find_package(LLVM 14 REQUIRED CONFIG)
13-
include_directories(${LLVM_INCLUDE_DIRS})
14-
link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
15-
find_library(LLVM_LIBRARY NAMES LLVM HINTS ${LLVM_LIBRARY_DIRS})
1639
if(NOT ${LLVM_LIBRARY} STREQUAL "LLVM_LIBRARY-NOTFOUND")
1740
llvm_config(${executable} USE_SHARED ${PHASAR_LLVM_DEPS})
1841
else()
1942
llvm_config(${executable} ${PHASAR_LLVM_DEPS})
2043
endif()
21-
list(REMOVE_DUPLICATES PHASAR_NEEDED_LIBS)
44+
2245
target_link_libraries(${executable}
2346
PUBLIC
2447
${PHASAR_NEEDED_LIBS}
25-
)
48+
)
2649
endfunction()

0 commit comments

Comments
 (0)