svf-tools 1.0.1297 → 1.0.1299

package/build.sh

@@ -30,9 +30,11 @@ UbuntuArmLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 UbuntuLLVM_RTTI="https://github.com/bjjwwang/SVF-LLVM/releases/download/${LLVMVer}/llvm-${LLVMVer}-ubuntu22-rtti-x86-64.tar.gz"
 UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-x86_64-linux-gnu-ubuntu-18.04.tar.xz"
 SourceLLVM="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${LLVMVer}.zip"
-UbuntuZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-ubuntu-16.04.zip"
-UbuntuZ3Arm="https://github.com/SVF-tools/SVF-npm/raw/prebuilt-libs/z3-4.8.7-aarch64-ubuntu.zip"
-SourceZ3="https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.8.8.zip"
+Z3Ver=4.15.4
+Z3PrebuiltBase="https://github.com/SVF-tools/SVF-npm/raw/prebuilt-libs"
+UbuntuZ3="${Z3PrebuiltBase}/z3-${Z3Ver}-x86_64-ubuntu-22.04.zip"
+UbuntuZ3Arm="${Z3PrebuiltBase}/z3-${Z3Ver}-arm64-ubuntu-22.04.zip"
+MacOSZ3Arm="${Z3PrebuiltBase}/z3-${Z3Ver}-arm64-macos-14.zip"
 
 # Keep LLVM version suffix for version checking and better debugging
 # keep the version consistent with LLVM_DIR in setup.sh and llvm_version in Dockerfile
@@ -116,27 +118,6 @@ function check_xz {
     fi
 }
 
-function build_z3_from_source {
-    mkdir "$Z3Home"
-    echo "Downloading Z3 source..."
-    generic_download_file "$SourceZ3" z3.zip
-    check_unzip
-    echo "Unzipping Z3 source..."
-    mkdir z3-source
-    unzip z3.zip -d z3-source
-
-    echo "Building Z3..."
-    mkdir z3-build
-    cd z3-build
-    # /* is a dirty hack to get z3-version...
-    cmake -DCMAKE_INSTALL_PREFIX="$SVFHOME/$Z3Home" -DZ3_BUILD_LIBZ3_SHARED=false ../z3-source/*
-    cmake --build . -j ${jobs}
-    cmake --install .
-
-    cd ..
-    rm -r z3-source z3-build z3.zip
-}
-
 function build_llvm_from_source {
     mkdir "$LLVMHome"
     echo "Downloading LLVM source..."
@@ -179,6 +160,64 @@ function check_and_install_brew {
     fi
 }
 
+function unpack_z3_package {
+    if [[ $# -ne 1 ]]; then
+        echo "$0: bad args to unpack_z3_package!"
+        exit 1
+    fi
+
+    local archive="$1"
+    local unpack_dir="z3-unpack"
+    local nested_zip=""
+    local z3_dir=""
+
+    rm -rf "$unpack_dir" "$Z3Home"
+    mkdir "$unpack_dir"
+    unzip -q "$archive" -d "$unpack_dir"
+
+    if [[ -d "$unpack_dir/z3.obj" ]]; then
+        mv "$unpack_dir/z3.obj" "$Z3Home"
+    else
+        nested_zip=$(find "$unpack_dir" -maxdepth 1 -type f -name 'z3-*.zip' | head -n 1)
+        if [[ -n "$nested_zip" ]]; then
+            mkdir "$unpack_dir/nested"
+            unzip -q "$nested_zip" -d "$unpack_dir/nested"
+            if [[ -d "$unpack_dir/nested/z3.obj" ]]; then
+                mv "$unpack_dir/nested/z3.obj" "$Z3Home"
+            else
+                z3_dir=$(find "$unpack_dir/nested" -mindepth 1 -maxdepth 1 -type d -name 'z3-*' | head -n 1)
+                [[ -n "$z3_dir" ]] && mv "$z3_dir" "$Z3Home"
+            fi
+        else
+            z3_dir=$(find "$unpack_dir" -mindepth 1 -maxdepth 1 -type d -name 'z3-*' | head -n 1)
+            [[ -n "$z3_dir" ]] && mv "$z3_dir" "$Z3Home"
+        fi
+    fi
+
+    rm -rf "$unpack_dir"
+
+    if [[ ! -d "$Z3Home/include" || ! -d "$Z3Home/bin" ]]; then
+        echo "Z3 package did not contain the expected $Z3Home/bin and $Z3Home/include layout."
+        exit 1
+    fi
+}
+
+function fix_macos_z3_install_name {
+    if [[ "$sysOS" != "Darwin" ]]; then
+        return
+    fi
+
+    # Only rewrite the prebuilt Z3 that build.sh owns, not a user-provided Z3_DIR.
+    if [[ "$Z3_DIR" != "$SVFHOME/$Z3Home" ]]; then
+        return
+    fi
+
+    local z3_dylib="$Z3_DIR/bin/libz3.dylib"
+    if [[ -f "$z3_dylib" ]]; then
+        install_name_tool -id "@rpath/libz3.dylib" "$z3_dylib"
+    fi
+}
+
 # OS-specific values.
 urlLLVM=""
 urlZ3=""
@@ -188,9 +227,17 @@ urlZ3=""
 # M1 Macs give back arm64, some Linuxes can give aarch64 for arm architecture
 #######
 if [[ $sysOS == "Darwin" ]]; then
-    check_and_install_brew
+    if [[ "$arch" == "arm64" ]]; then
+      urlZ3="$MacOSZ3Arm"
+    else
+      if [[ -z "$Z3_DIR" && ! -d "$Z3Home" ]]; then
+        echo "No prebuilt Z3 package is available for macOS architecture '$arch'."
+        echo "Set Z3_DIR to a compatible z3.obj directory before running build.sh."
+        exit 1
+      fi
+    fi
 elif [[ $sysOS == "Linux" ]]; then
-    if [[ "$arch" == "aarch64" ]]; then
+    if [[ "$arch" == "aarch64" || "$arch" == "arm64" ]]; then
       if [[ "$BUILD_DYN_LIB" == "ON" ]]; then
         urlLLVM="$UbuntuArmLLVM_RTTI"
       else
@@ -221,6 +268,7 @@ if [[ ! -d "$LLVM_DIR" ]]; then
     if [[ ! -d "$LLVMHome" ]]; then
         if [[ "$sysOS" = "Darwin" ]]; then
             echo "Installing LLVM binary for $OSDisplayName"
+            check_and_install_brew
             brew install llvm@${MajorLLVMVer}
             # check whether llvm is installed
             if [ $? -eq 0 ]; then
@@ -250,35 +298,23 @@ fi
 #######
 if [[ ! -d "$Z3_DIR" ]]; then
     if [[ ! -d "$Z3Home" ]]; then
-        # M1 Macs give back arm64, some Linuxes can give aarch64.
-        if [[ "$sysOS" = "Darwin" ]]; then
-            echo "Downloading Z3 binary for $OSDisplayName"
-            brew install z3
-            if [ $? -eq 0 ]; then
-		      echo "z3 binary installation completed."
-	        else
-		      echo "z3 binary installation failed."
-		      exit 1
-	        fi
-            mkdir -p $SVFHOME/$Z3Home
-            ln -s $(brew --prefix z3)/* $SVFHOME/$Z3Home
-        else
-            # everything else downloads pre-built lib
-            echo "Downloading Z3 binary for $OSDisplayName"
-            generic_download_file "$urlZ3" z3.zip
-            check_unzip
-            echo "Unzipping z3 package..."
-            unzip -q "z3.zip" && mv ./z3-* ./$Z3Home
-            rm z3.zip
-        fi
+        echo "Downloading prebuilt Z3 ${Z3Ver} package for $sysOS/$arch"
+        generic_download_file "$urlZ3" z3.zip
+        check_unzip
+        echo "Unzipping z3 package..."
+        unpack_z3_package z3.zip
+        rm z3.zip
     fi
 
     export Z3_DIR="$SVFHOME/$Z3Home"
 fi
 
+fix_macos_z3_install_name
+
 # Add LLVM & Z3 to $PATH and $LD_LIBRARY_PATH (prepend so that selected instances will be used first)
-PATH=$LLVM_DIR/bin:$Z3_DIR/bin:$PATH
-LD_LIBRARY_PATH=$LLVM_DIR/lib:$Z3_BIN/lib:$LD_LIBRARY_PATH
+export PATH=$LLVM_DIR/bin:$Z3_DIR/bin:$PATH
+export LD_LIBRARY_PATH=$LLVM_DIR/lib:$Z3_DIR/bin:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$LLVM_DIR/lib:$Z3_DIR/bin:$DYLD_LIBRARY_PATH
 
 echo "LLVM_DIR=$LLVM_DIR"
 echo "Z3_DIR=$Z3_DIR"
@@ -293,6 +329,15 @@ else
 fi
 BUILD_DIR="./${BUILD_TYPE}-build"
 
+CMAKE_RPATH_ARGS=()
+if [[ "$sysOS" == "Darwin" ]]; then
+    CMAKE_RPATH_ARGS=(
+        -DCMAKE_MACOSX_RPATH=ON
+        "-DCMAKE_BUILD_RPATH=@loader_path/../lib;@loader_path/../../${Z3Home}/bin"
+        "-DCMAKE_INSTALL_RPATH=@loader_path/../lib;@loader_path/../../../${Z3Home}/bin"
+    )
+fi
+
 rm -rf "${BUILD_DIR}"
 mkdir "${BUILD_DIR}"
 # If you need shared libs, turn BUILD_SHARED_LIBS on
@@ -300,6 +345,7 @@ cmake -D CMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}"   \
     -DSVF_ENABLE_ASSERTIONS:BOOL=true              \
     -DSVF_SANITIZE="${SVF_SANITIZER}"              \
     -DBUILD_SHARED_LIBS=${BUILD_DYN_LIB}            \
+    "${CMAKE_RPATH_ARGS[@]}"                        \
     -S "${SVFHOME}" -B "${BUILD_DIR}"
 cmake --build "${BUILD_DIR}" -j ${jobs}
 

package/cmake/Modules/FindZ3.cmake

@@ -4,30 +4,62 @@
 
 include(GNUInstallDirs)
 
+set(_Z3_HINTS ${Z3_HOME} $ENV{Z3_HOME} ${Z3_DIR} $ENV{Z3_DIR})
+set(_Z3_EXPLICIT_ROOT "")
+foreach(_Z3_HINT IN LISTS _Z3_HINTS)
+  if(_Z3_HINT AND EXISTS "${_Z3_HINT}/include/z3++.h")
+    set(_Z3_EXPLICIT_ROOT "${_Z3_HINT}")
+    break()
+  endif()
+endforeach()
+
 # Try upstream/system CONFIG package first; use it if found (sets required variables):
-find_package(Z3 CONFIG QUIET HINTS ${Z3_HOME} $ENV{Z3_HOME} ${Z3_DIR} $ENV{Z3_DIR})
+if(NOT _Z3_EXPLICIT_ROOT)
+  find_package(Z3 CONFIG QUIET HINTS ${_Z3_HINTS})
+endif()
 if(Z3_FOUND)
   if(NOT Z3_FIND_QUIETLY)
     message(STATUS "Found upstream/system Z3 package (Z3Config.cmake)")
   endif()
 else()
   if(NOT Z3_FIND_QUIETLY)
-    message(STATUS "Failed to find upstream/system Z3 package; reverting to manual search")
+    if(_Z3_EXPLICIT_ROOT)
+      message(STATUS "Using explicit Z3 root: ${_Z3_EXPLICIT_ROOT}")
+    else()
+      message(STATUS "Failed to find upstream/system Z3 package; reverting to manual search")
+    endif()
   endif()
 
   # Fall back to explicit manual header + lib search (prioritise searching $Z3_DIR)
-  find_library(
-    Z3_LIBRARY_DIR
-    NAMES z3 libz3
-    HINTS ${Z3_HOME} $ENV{Z3_HOME} ${Z3_DIR} $ENV{Z3_DIR}
-    PATH_SUFFIXES bin lib ${CMAKE_INSTALL_BINDIR} ${CMAKE_INSTALL_LIBDIR}
-  )
-  find_path(
-    Z3_INCLUDE_DIR
-    NAMES z3++.h
-    HINTS ${Z3_HOME} $ENV{Z3_HOME} ${Z3_DIR} $ENV{Z3_DIR}
-    PATH_SUFFIXES include ${CMAKE_INSTALL_INCLUDEDIR}
-  )
+  if(_Z3_EXPLICIT_ROOT)
+    find_library(
+      Z3_LIBRARY_DIR
+      NAMES z3 libz3
+      HINTS ${_Z3_EXPLICIT_ROOT}
+      PATH_SUFFIXES bin lib ${CMAKE_INSTALL_BINDIR} ${CMAKE_INSTALL_LIBDIR}
+      NO_DEFAULT_PATH
+    )
+    find_path(
+      Z3_INCLUDE_DIR
+      NAMES z3++.h
+      HINTS ${_Z3_EXPLICIT_ROOT}
+      PATH_SUFFIXES include ${CMAKE_INSTALL_INCLUDEDIR}
+      NO_DEFAULT_PATH
+    )
+  else()
+    find_library(
+      Z3_LIBRARY_DIR
+      NAMES z3 libz3
+      HINTS ${_Z3_HINTS}
+      PATH_SUFFIXES bin lib ${CMAKE_INSTALL_BINDIR} ${CMAKE_INSTALL_LIBDIR}
+    )
+    find_path(
+      Z3_INCLUDE_DIR
+      NAMES z3++.h
+      HINTS ${_Z3_HINTS}
+      PATH_SUFFIXES include ${CMAKE_INSTALL_INCLUDEDIR}
+    )
+  endif()
 
   # If the headers were found, find & extract the Z3 version number
   set(_ver_h "${Z3_INCLUDE_DIR}/z3_version.h")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1297",
+  "version": "1.0.1299",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/AE/Core/AddressValue.h

@@ -177,8 +177,10 @@ public:
     bool hasIntersect(const AddressValue &other) const
     {
         for (const auto& addr : _addrs)
+        {
             if (other._addrs.count(addr))
                 return true;
+        }
         return false;
     }
 

package/svf/include/Util/SparseBitVector.h

@@ -536,7 +536,9 @@ class SparseBitVector
 
         // Make sure our current iterator is valid.
         if (CurrElementIter == End)
+        {
             --CurrElementIter;
+        }
 
         // Search from our current iterator, either backwards or forwards,
         // depending on what element we are looking for.
@@ -755,7 +757,9 @@ public:
         // is nothing more to do.
         if (ElementIter == Elements.end() ||
                 ElementIter->index() != ElementIndex)
+        {
             return false;
+        }
         return ElementIter->test(Idx % ElementSize);
     }