Merge pull request #489 from secure-software-engineering/development

Update master branch

Author: pdschubert

.clang-tidy

@@ -51,11 +51,11 @@ CheckOptions:
   - key:             readability-identifier-naming.VariableCase
     value:           CamelCase
   - key:             readability-identifier-naming.VariableIgnoredRegexp
-    value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|dPrime|fPrime)
+    value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|nPrime|dPrime|fPrime)
   - key:             readability-identifier-naming.ParameterIgnoredRegexp
     value:           (d|d1|d2|d3|d4|d5|eP|f|n)
   - key:             readability-identifier-naming.FunctionIgnoredRegexp
-    value:           (try_emplace|from_json|to_json)
+    value:           (try_emplace|from_json|to_json|equal_to)
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
     value:           1
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        compiler: [ [clang++-12, clang-12] ]
+        compiler: [ [clang++-13, clang-13] ]
         build: [ Debug, Release ]
 
     continue-on-error: false
@@ -42,16 +42,16 @@ jobs:
         shell: bash
         run: |
           sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
-          sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main'
+          sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
           sudo apt-get update
           sudo apt-get -y install --no-install-recommends \
               ${{ matrix.compiler[1] }} \
-              llvm-12-dev \
-              libllvm12 \
-              libclang-common-12-dev \
-              libclang-12-dev \
-              libclang-cpp12-dev \
-              clang-tidy-12
+              llvm-13-dev \
+              libllvm13 \
+              libclang-common-13-dev \
+              libclang-13-dev \
+              libclang-cpp13-dev \
+              clang-tidy-13
 
       - name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }}
         env:

.github/workflows/reviewdog-clang-format.yml

@@ -15,11 +15,11 @@ jobs:
           - tool: clang-format
             install: |
               sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
-              sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main'
+              sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
               sudo apt-get update
-              sudo apt-get -y install --no-install-recommends clang-format-12
+              sudo apt-get -y install --no-install-recommends clang-format-13
             regex: \.(h|c|hpp|cpp)$
-            command: clang-format-12 --style=file -i
+            command: clang-format-13 --style=file -i
 
     continue-on-error: false
     steps:

.pre-commit-config.yaml

@@ -10,6 +10,6 @@ repos:
     -   id: check-added-large-files
     -   id: requirements-txt-fixer
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v12.0.1'
+    rev: 'v13.0.0'
     hooks:
     -   id: clang-format

CMakeLists.txt

@@ -179,7 +179,7 @@ include_directories(${SQLITE3_INCLUDE_DIR})
 # LLVM
 if (NOT PHASAR_IN_TREE)
   # Only search for LLVM if we build out of tree
-  find_package(LLVM 12 REQUIRED CONFIG)
+  find_package(LLVM 13 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
 endif()

Config.cmake.in

@@ -9,7 +9,7 @@ foreach(component ${phasar_FIND_COMPONENTS})
 endforeach()
 
 function(phasar_config executable)
-  find_package(LLVM 12 REQUIRED CONFIG)
+  find_package(LLVM 13 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
   find_library(LLVM_LIBRARY NAMES LLVM HINTS ${LLVM_LIBRARY_DIRS})

Dockerfile

@@ -1,5 +1,5 @@
-FROM ubuntu:latest
-ARG LLVM_INSTALL_DIR="/usr/local/llvm-10"
+FROM ubuntu:20.04
+ARG LLVM_INSTALL_DIR="/usr/local/llvm-12"
 LABEL Name=phasar Version=1.0.0
 
 RUN apt -y update && apt install bash sudo -y
@@ -21,7 +21,7 @@ RUN apt install libboost-all-dev -y
 # installing LLVM
 COPY utils/safeCommandsSet.sh /usr/src/phasar/utils/safeCommandsSet.sh
 COPY utils/install-llvm.sh /usr/src/phasar/utils/install-llvm.sh
-RUN ./utils/install-llvm.sh $(nproc) . ${LLVM_INSTALL_DIR} "llvmorg-10.0.0"
+RUN ./utils/install-llvm.sh $(nproc) . ${LLVM_INSTALL_DIR} "llvmorg-12.0.0"
 
 # installing wllvm
 RUN pip3 install wllvm

README.md

@@ -6,7 +6,7 @@ PhASAR a LLVM-based Static Analysis Framework
 [![C++ Standard](https://img.shields.io/badge/C++_Standard-C%2B%2B17-blue.svg?style=flat&logo=c%2B%2B)](https://isocpp.org/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blueviolet.svg)](https://raw.githubusercontent.com/secure-software-engineering/phasar/master/LICENSE.txt)
 
-Version 0521
+Version 0222
 
 Secure Software Engineering Group
 ---------------------------------
@@ -20,7 +20,7 @@ PhASAR requires C++-17.
 
 Currently supported version of LLVM
 -----------------------------------
-PhASAR is currently set up to support LLVM-12.0.
+PhASAR is currently set up to support LLVM-13.0.
 
 What is PhASAR?
 ---------------

bootstrap.sh

@@ -5,10 +5,10 @@ source ./utils/safeCommandsSet.sh
 
 readonly PHASAR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 readonly PHASAR_INSTALL_DIR="/usr/local/phasar"
-readonly LLVM_INSTALL_DIR="/usr/local/llvm-12"
+readonly LLVM_INSTALL_DIR="/usr/local/llvm-13"
 
 NUM_THREADS=$(nproc)
-LLVM_RELEASE=llvmorg-12.0.0
+LLVM_RELEASE=llvmorg-13.0.0
 DO_UNIT_TEST=true
 
 

include/phasar/Config/Version.h

@@ -1,6 +1,6 @@
 #ifndef PHASAR_CONFIG_VERSION_H
 #define PHASAR_CONFIG_VERSION_H
 
-#define PHASAR_VERSION v0521
+#define PHASAR_VERSION v0222
 
 #endif