svf-lib 1.0.1847 → 1.0.1849

package/SVF-osx/svf/include/Graphs/CHG.h

@@ -350,8 +350,8 @@ struct GenericGraphTraits<SVF::CHNode*>
 /// for inverse traversal.
 template <>
 struct GenericGraphTraits<Inverse<SVF::CHNode*>>
-    : public GenericGraphTraits<
-      Inverse<SVF::GenericNode<SVF::CHNode, SVF::CHEdge>*>>
+            : public GenericGraphTraits<
+              Inverse<SVF::GenericNode<SVF::CHNode, SVF::CHEdge>*>>
 {
 };
 

package/SVF-osx/svf/include/Graphs/GraphTraits.h

@@ -115,7 +115,7 @@ nodes(const GraphType &G)
 }
 template <class GraphType>
 iter_range<typename GenericGraphTraits<Inverse<GraphType>>::nodes_iterator>
-inverse_nodes(const GraphType &G)
+        inverse_nodes(const GraphType &G)
 {
     return make_range(GenericGraphTraits<Inverse<GraphType>>::nodes_begin(G),
                       GenericGraphTraits<Inverse<GraphType>>::nodes_end(G));
@@ -131,7 +131,7 @@ children(const typename GenericGraphTraits<GraphType>::NodeRef &G)
 
 template <class GraphType>
 iter_range<typename GenericGraphTraits<Inverse<GraphType>>::ChildIteratorType>
-inverse_children(const typename GenericGraphTraits<GraphType>::NodeRef &G)
+        inverse_children(const typename GenericGraphTraits<GraphType>::NodeRef &G)
 {
     return make_range(GenericGraphTraits<Inverse<GraphType>>::child_begin(G),
                       GenericGraphTraits<Inverse<GraphType>>::child_end(G));

package/SVF-osx/svf/include/Util/Casting.h

@@ -382,7 +382,7 @@ inline typename cast_retty<X, Y *>::ret_type cast(Y *Val)
 
 template <class X, class Y>
 inline typename cast_retty<X, std::unique_ptr<Y>>::ret_type
-cast(std::unique_ptr<Y> &&Val)
+        cast(std::unique_ptr<Y> &&Val)
 {
     assert(SVFUtil::isa<X>(Val.get()) && "cast<Ty>() argument of incompatible type!");
     using ret_type = typename cast_retty<X, std::unique_ptr<Y>>::ret_type;

package/SVF-osx/svf/include/Util/NodeIDAllocator.h

@@ -192,8 +192,8 @@ public:
 
         // From all the candidates, returns the best mapping for pointsToSets (points-to set -> # occurrences).
         static inline std::pair<hclust_fast_methods, std::vector<NodeID>> determineBestMapping(
-            const std::vector<std::pair<hclust_fast_methods, std::vector<NodeID>>> &candidates,
-            Map<PointsTo, unsigned> pointsToSets, const std::string &evalSubtitle, double &evalTime);
+                    const std::vector<std::pair<hclust_fast_methods, std::vector<NodeID>>> &candidates,
+                    Map<PointsTo, unsigned> pointsToSets, const std::string &evalSubtitle, double &evalTime);
 
     };
 };

package/SVF-osx/svf/include/Util/Options.h

@@ -260,6 +260,7 @@ public:
     // Loop Analysis
     static const Option<bool> LoopAnalysis;
     static const Option<u32_t> LoopBound;
+
 };
 }  // namespace SVF
 

package/SVF-osx/svf/include/Util/iterator.h

@@ -352,7 +352,7 @@ struct pointee_iter
 template <typename RangeT, typename WrappedIteratorT =
           decltype(std::begin(std::declval<RangeT>()))>
 iter_range<pointee_iter<WrappedIteratorT>>
-make_pointee_range(RangeT &&Range)
+                                        make_pointee_range(RangeT &&Range)
 {
     using PointeeIteratorT = pointee_iter<WrappedIteratorT>;
     return make_range(PointeeIteratorT(std::begin(std::forward<RangeT>(Range))),
@@ -388,7 +388,7 @@ public:
 template <typename RangeT, typename WrappedIteratorT =
           decltype(std::begin(std::declval<RangeT>()))>
 iter_range<pointer_iterator<WrappedIteratorT>>
-make_pointer_range(RangeT &&Range)
+        make_pointer_range(RangeT &&Range)
 {
     using PointerIteratorT = pointer_iterator<WrappedIteratorT>;
     return make_range(PointerIteratorT(std::begin(std::forward<RangeT>(Range))),

package/llvm_install.sh

@@ -1,29 +1,48 @@
 #!/bin/bash
 SVFHOME=$(pwd)
 sysOS=`uname -s`
-MacLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-apple-darwin.tar.xz"
-UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz"
+MajorLLVMVer=16
+LLVMVer=${MajorLLVMVer}.0.0
+UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-x86_64-linux-gnu-ubuntu-18.04.tar.xz"
 MacZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-osx-10.14.6.zip"
 UbuntuZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-ubuntu-16.04.zip"
 Z3Home="z3.obj"
-LLVMHome="llvm-14.0.0.obj"
+LLVMHome="llvm-${LLVMVer}.obj"
 cd $SVFHOME
 cd ..
 install_path=$(pwd)
+
+function check_and_install_brew {
+    if command -v brew >/dev/null 2>&1; then
+        echo "Homebrew is already installed."
+    else
+        echo "Homebrew not found. Installing Homebrew..."
+        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        if [ $? -eq 0 ]; then
+            echo "Homebrew installation completed."
+        else
+            echo "Homebrew installation failed."
+            exit 1
+        fi
+    fi
+}
+
 ########
 # Download LLVM binary
 ########
 if [[ $sysOS == "Darwin" ]]
 then
-       if [ ! -d "$install_path/$LLVMHome" ]
-       then
-       		echo 'Downloading LLVM binary for MacOS '
-      		curl -L $MacLLVM > llvm-mac.tar.xz
-      	 	mkdir $install_path/$LLVMHome 
-		echo 'Unzipping LLVM binary for MacOS '
-		tar -xf "llvm-mac.tar.xz" -C $install_path/$LLVMHome --strip-components 1
-		rm llvm-mac.tar.xz
+       check_and_install_brew
+       echo "Installing LLVM binary"
+       brew install llvm@${MajorLLVMVer}
+       # check whether llvm is installed
+       if [ $? -eq 0 ]; then
+              echo "LLVM binary installation completed."
+       else
+              echo "LLVM binary installation failed."
+              exit 1
        fi
+       export LLVM_DIR="$(brew --prefix llvm@${MajorLLVMVer})"
 elif [[ $sysOS == "Linux" ]]
 then
        if [ ! -d "$install_path/$LLVMHome" ]
@@ -34,11 +53,12 @@ then
 		echo 'Unzipping LLVM binary for Ubuntu'
 		tar -xf "llvm-ubuntu.tar.xz" -C $install_path/$LLVMHome --strip-components 1
 		rm llvm-ubuntu.tar.xz
+  		export LLVM_DIR="$install_path/$LLVMHome"
        fi
 else
 	echo 'not support llvm builds in OS other than Ubuntu and Mac'
 fi
-echo "LLVM_DIR=$install_path/$LLVMHome"
+echo "LLVM_DIR=$LLVM_DIR"
 ########
 # Download z3 binary
 ########
@@ -67,15 +87,17 @@ then
 else
 	echo 'not support z3 builds in OS other than Ubuntu and Mac'
 fi
-echo "Z3_DIR=$install_path/$Z3Home"
+export Z3_DIR="$install_path/$Z3Home"
+echo "Z3_DIR=$Z3_DIR"
+export SVF_DIR="$install_path/SVF"
+echo "SVF_DIR=$SVF_DIR"
+
 if [[ $sysOS == "Darwin" ]]
 then 
-ln -s $install_path/svf-lib/SVF-osx $install_path/SVF
-echo "SVF_DIR=$install_path/SVF/"
-echo -e "Build your own project with the following cmake command:\n cmake -DSVF_DIR=$install_path/SVF/SVF-osx -DLLVM_DIR=$install_path/$LLVMHome"
+ln -s $install_path/svf-lib/SVF-osx $SVF_DIR
+echo -e "Build your own project with the following cmake command:\n cmake -DSVF_DIR=$SVF_DIR -DLLVM_DIR=$LLVM_DIR"
 elif [[ $sysOS == "Linux" ]]
 then 
-ln -s $install_path/svf-lib/SVF-linux $install_path/SVF
-echo "SVF_DIR=$install_path/SVF/"
-echo -e "Build your own project with the following cmake command:\n cmake -DSVF_DIR=$install_path/SVF/SVF-linux -DLLVM_DIR=$install_path/$LLVMHome"
+ln -s $install_path/svf-lib/SVF-linux $SVF_DIR
+echo -e "Build your own project with the following cmake command:\n cmake -DSVF_DIR=$SVF_DIR -DLLVM_DIR=$LLVM_DIR"
 fi

package/package.json

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