svf-lib 1.0.2639 → 1.0.2641

package/SVF-linux-x86_64/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-linux-x86_64/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);
     }
 

package/SVF-linux-x86_64/lib/cmake/SVF/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/llvm_install.sh

@@ -4,14 +4,125 @@ sysOS=`uname -s`
 arch=`uname -m`
 MajorLLVMVer=21
 LLVMVer=${MajorLLVMVer}.1.0
+Z3Ver=4.15.4
 UbuntuLLVM_RTTI="https://github.com/bjjwwang/SVF-LLVM/releases/download/${LLVMVer}/llvm-${LLVMVer}-ubuntu22-rtti-x86-64.tar.gz"
 UbuntuArmLLVM_RTTI="https://github.com/bjjwwang/SVF-LLVM/releases/download/${LLVMVer}/llvm-${LLVMVer}-ubuntu22-rtti-aarch64.tar.gz"
 
-UbuntuZ3Arm="https://github.com/SVF-tools/SVF-npm/raw/prebuilt-libs/z3-4.8.7-aarch64-ubuntu.zip"
-UbuntuZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-ubuntu-16.04.zip"
+Z3PrebuiltBase="https://github.com/SVF-tools/SVF-npm/raw/prebuilt-libs"
+UbuntuZ3Arm="${Z3PrebuiltBase}/z3-${Z3Ver}-arm64-ubuntu-22.04.zip"
+UbuntuZ3="${Z3PrebuiltBase}/z3-${Z3Ver}-x86_64-ubuntu-22.04.zip"
+MacOSZ3Arm="${Z3PrebuiltBase}/z3-${Z3Ver}-arm64-macos-14.zip"
 Z3Home="z3.obj"
 LLVMHome="llvm-${LLVMVer}.obj"
 
+function download_file {
+    if [[ $# -ne 2 ]]; then
+        echo "$0: bad args to download_file!"
+        exit 1
+    fi
+
+    local url="$1"
+    local out="$2"
+
+    local download_failed=false
+    if command -v curl >/dev/null 2>&1; then
+        if ! curl -fL "$url" -o "$out"; then
+            download_failed=true
+        fi
+    elif command -v wget >/dev/null 2>&1; then
+        if ! wget -c "$url" -O "$out"; then
+            download_failed=true
+        fi
+    else
+        echo "Cannot find curl or wget."
+        exit 1
+    fi
+
+    if $download_failed; then
+        echo "Failed to download $url"
+        rm -f "$out"
+        exit 1
+    fi
+}
+
+function find_z3_root {
+    local search_dir="$1"
+    local candidate=""
+
+    while IFS= read -r -d '' candidate; do
+        if [[ -d "$candidate/include" && -d "$candidate/bin" ]]; then
+            echo "$candidate"
+            return 0
+        fi
+    done < <(find "$search_dir" -type d -print0)
+
+    return 1
+}
+
+function unpack_z3_package {
+    if [[ $# -ne 2 ]]; then
+        echo "$0: bad args to unpack_z3_package!"
+        exit 1
+    fi
+
+    local archive="$1"
+    local target_dir="$2"
+    local unpack_dir="z3-unpack"
+    local nested_zip=""
+    local nested_dir=""
+    local z3_dir=""
+
+    rm -rf "$unpack_dir" "$target_dir"
+    mkdir "$unpack_dir"
+    unzip -q "$archive" -d "$unpack_dir"
+
+    while IFS= read -r -d '' nested_zip; do
+        nested_dir="$unpack_dir/nested-$(basename "$nested_zip" .zip)"
+        mkdir -p "$nested_dir"
+        unzip -q "$nested_zip" -d "$nested_dir"
+    done < <(find "$unpack_dir" -type f -name 'z3-*.zip' -print0)
+
+    if ! z3_dir=$(find_z3_root "$unpack_dir"); then
+        rm -rf "$unpack_dir"
+        echo "Z3 package did not contain the expected bin/ and include/ layout."
+        exit 1
+    fi
+
+    mv "$z3_dir" "$target_dir"
+    rm -rf "$unpack_dir"
+}
+
+function fix_linux_z3_links {
+    if [[ "$sysOS" != "Linux" ]]; then
+        return
+    fi
+
+    if [[ -f "$Z3_DIR/bin/libz3.so" ]]; then
+        ln -sf libz3.so "$Z3_DIR/bin/libz3.so.4"
+    fi
+}
+
+function fix_macos_z3_load_paths {
+    if [[ "$sysOS" != "Darwin" ]]; then
+        return
+    fi
+
+    local z3_dylib="$Z3_DIR/bin/libz3.dylib"
+    local z3_rpath="@loader_path/../../../${Z3Home}/bin"
+    local binary=""
+
+    if [[ -f "$z3_dylib" ]]; then
+        install_name_tool -id "@rpath/libz3.dylib" "$z3_dylib"
+    fi
+
+    while IFS= read -r -d '' binary; do
+        install_name_tool -change "/opt/homebrew/opt/z3/lib/libz3.4.15.dylib" "@rpath/libz3.dylib" "$binary" 2>/dev/null || true
+        install_name_tool -change "/opt/homebrew/opt/z3/lib/libz3.dylib" "@rpath/libz3.dylib" "$binary" 2>/dev/null || true
+        install_name_tool -change "libz3.dylib" "@rpath/libz3.dylib" "$binary" 2>/dev/null || true
+        install_name_tool -add_rpath "$z3_rpath" "$binary" 2>/dev/null || true
+    done < <(find "$SVFHOME/SVF-osx/bin" "$SVFHOME/SVF-osx/lib" \( -type f -perm -111 -o -name '*.dylib' \) -print0)
+}
+
 if [[ $sysOS == "Darwin" ]]
 then
   # Create soft links for SvfLLVM
@@ -112,16 +223,18 @@ if [[ $sysOS == "Darwin" ]]
 then
        if [ ! -d "$install_path/$Z3Home" ]
        then
-       		echo 'Downloading z3 binary for MacOS '
-	 	brew install z3
-   		if [ $? -eq 0 ]; then
-		      echo "z3 binary installation completed."
-	        else
-		      echo "z3 binary installation failed."
-		      exit 1
-	        fi
-      	 	mkdir -p $install_path/$Z3Home
-       		ln -s $(brew --prefix z3)/* $install_path/$Z3Home
+         if [[ $arch == "arm64" ]]
+         then
+           urlZ3=$MacOSZ3Arm
+         else
+           echo "No prebuilt z3 binary is available for MacOS ${arch}."
+           exit 1
+         fi
+         echo 'Downloading z3 binary for MacOS arm64'
+         download_file "$urlZ3" z3.zip
+         echo 'Unzipping z3 binary for MacOS'
+         unpack_z3_package z3.zip "$install_path/$Z3Home"
+         rm z3.zip
        fi
 elif [[ $sysOS == "Linux" ]]
 then
@@ -135,17 +248,18 @@ then
        fi
        if [ ! -d "$install_path/$Z3Home" ]
        then
-       		echo 'Downloading z3 binary for Ubuntu'
-      		wget -c $urlZ3 -O z3.zip
-      		mkdir $install_path/$Z3Home
-          echo 'Unzipping z3 binary for Ubuntu'
-          unzip -q "z3.zip" && mv ./z3-*/* $install_path/$Z3Home/
-          rm z3.zip
+         echo 'Downloading z3 binary for Ubuntu'
+         download_file "$urlZ3" z3.zip
+         echo 'Unzipping z3 binary for Ubuntu'
+         unpack_z3_package z3.zip "$install_path/$Z3Home"
+         rm z3.zip
        fi
 else
 	echo 'not support z3 builds in OS other than Ubuntu and Mac'
 fi
 export Z3_DIR="$install_path/$Z3Home"
+fix_linux_z3_links
+fix_macos_z3_load_paths
 echo "Z3_DIR=$Z3_DIR"
 export SVF_DIR="$install_path/SVF"
 echo "SVF_DIR=$SVF_DIR"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2639",
+  "version": "1.0.2641",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {