Skip to content

Commit 83b519e

Browse files
authored
Merge branch 'development' into f-LLVM13Support
2 parents 73d8f8b + 36445a6 commit 83b519e

12 files changed

Lines changed: 479 additions & 370 deletions

File tree

.clang-tidy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ CheckOptions:
5151
- key: readability-identifier-naming.VariableCase
5252
value: CamelCase
5353
- key: readability-identifier-naming.VariableIgnoredRegexp
54-
value: (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|dPrime|fPrime)
54+
value: (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|nPrime|dPrime|fPrime)
5555
- key: readability-identifier-naming.ParameterIgnoredRegexp
5656
value: (d|d1|d2|d3|d4|d5|eP|f|n)
5757
- key: readability-identifier-naming.FunctionIgnoredRegexp
58-
value: (try_emplace|from_json|to_json)
58+
value: (try_emplace|from_json|to_json|equal_to)
5959
- key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
6060
value: 1
6161
- key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM ubuntu:latest
2-
ARG LLVM_INSTALL_DIR="/usr/local/llvm-10"
1+
FROM ubuntu:20.04
2+
ARG LLVM_INSTALL_DIR="/usr/local/llvm-12"
33
LABEL Name=phasar Version=1.0.0
44

55
RUN apt -y update && apt install bash sudo -y
@@ -21,7 +21,7 @@ RUN apt install libboost-all-dev -y
2121
# installing LLVM
2222
COPY utils/safeCommandsSet.sh /usr/src/phasar/utils/safeCommandsSet.sh
2323
COPY utils/install-llvm.sh /usr/src/phasar/utils/install-llvm.sh
24-
RUN ./utils/install-llvm.sh $(nproc) . ${LLVM_INSTALL_DIR} "llvmorg-10.0.0"
24+
RUN ./utils/install-llvm.sh $(nproc) . ${LLVM_INSTALL_DIR} "llvmorg-12.0.0"
2525

2626
# installing wllvm
2727
RUN pip3 install wllvm

external/json

Submodule json updated 627 files

0 commit comments

Comments
 (0)