Merge pull request #436 from secure-software-engineering/f-LLVM13Support

Add LLVM 13 support

Author: pdschubert

.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})

README.md

@@ -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/Utils/BitVectorSet.h

@@ -270,6 +270,11 @@ template <typename T> class BitVectorSet {
   [[nodiscard]] size_t size() const noexcept { return Bits.count(); }
 
   friend bool operator==(const BitVectorSet &Lhs, const BitVectorSet &Rhs) {
+    bool LeftEmpty = Lhs.empty();
+    bool RightEmpty = Rhs.empty();
+    if (LeftEmpty || RightEmpty) {
+      return LeftEmpty == RightEmpty;
+    }
     // Check, whether Lhs and Rhs actually have the same bits set and not
     // whether their internal representation is exactly identitcal
     auto LhsWords = Lhs.Bits.getData();

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

@@ -274,8 +274,11 @@ normalizeGlobalGEPs(const std::vector<const llvm::Value *> &MemLocationSeq) {
                                              GepInst->idx_end());
 
     auto *SplittedGEPInst = llvm::GetElementPtrInst::CreateInBounds(
-        const_cast<llvm::Value *>( // FIXME this is terrible.
-            NormalizedMemLocationSeq.back()),
+        NormalizedMemLocationSeq.back()
+            ->getType()
+            ->getScalarType()
+            ->getPointerElementType(),
+        const_cast<llvm::Value *>(NormalizedMemLocationSeq.back()),
         {Indices[0], Indices[1]}, "gepsplit0");
     NormalizedMemLocationSeq.push_back(SplittedGEPInst);
 
@@ -289,8 +292,11 @@ normalizeGlobalGEPs(const std::vector<const llvm::Value *> &MemLocationSeq) {
       NameStream << "gepsplit" << (I - 1);
 
       SplittedGEPInst = llvm::GetElementPtrInst::CreateInBounds(
-          const_cast<llvm::Value *>( // FIXME this is terrible.
-              NormalizedMemLocationSeq.back()),
+          NormalizedMemLocationSeq.back()
+              ->getType()
+              ->getScalarType()
+              ->getPointerElementType(),
+          const_cast<llvm::Value *>(NormalizedMemLocationSeq.back()),
           {ConstantZero, Index}, NameStream.str());
       NormalizedMemLocationSeq.push_back(SplittedGEPInst);
     }