svf-tools 1.0.1046 → 1.0.1047

package/build.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 # type './build.sh'       for release build
 # type './build.sh debug' for debug build
-# if the LLVM_DIR variable is not set, LLVM will be downloaded.
+# type './build.sh shared' for building LLVM from source with shared libs and RTTI enabled
+# type './build.sh debug shared' for debug build with shared libs and RTTI enabled
+# If the LLVM_DIR variable is not set, LLVM will be downloaded or built from source.
 #
 # Dependencies include: build-essential libncurses5 libncurses-dev cmake zlib1g-dev
 set -e # exit on first error
@@ -9,7 +11,7 @@ set -e # exit on first error
 jobs=8
 
 #########
-# VARs and Links
+# Variables and Paths
 ########
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 SVFHOME="${SCRIPT_DIR}"
@@ -30,6 +32,20 @@ LLVMHome="llvm-${MajorLLVMVer}.0.0.obj"
 Z3Home="z3.obj"
 
 
+# Parse arguments
+BUILD_TYPE='Release'
+BUILD_SHARED='OFF'
+for arg in "$@"; do
+    if [[ $arg =~ ^[Dd]ebug$ ]]; then
+        BUILD_TYPE='Debug'
+    fi
+    if [[ $arg =~ ^[Ss]hared$ ]]; then
+        BUILD_SHARED='ON'
+    fi
+done
+
+
+
 # Downloads $1 (URL) to $2 (target destination) using wget or curl,
 # depending on OS.
 # E.g. generic_download_file www.url.com/my.zip loc/my.zip
@@ -114,8 +130,12 @@ function build_llvm_from_source {
     echo "Building LLVM..."
     mkdir llvm-build
     cd llvm-build
-    # /*/ is a dirty hack to get llvm-project-llvmorg-version...
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$SVFHOME/$LLVMHome" -DLLVM_ENABLE_PROJECTS=clang ../llvm-source/*/llvm
+    cmake -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX="$SVFHOME/$LLVMHome" \
+          -DLLVM_ENABLE_PROJECTS="clang" \
+          -DLLVM_ENABLE_RTTI=ON \
+          -DBUILD_SHARED_LIBS=ON \
+          ../llvm-source/*/llvm
     cmake --build . -j ${jobs}
     cmake --install .
 
@@ -186,13 +206,18 @@ if [[ ! -d "$LLVM_DIR" ]]; then
             mkdir -p $SVFHOME/$LLVMHome
             ln -s $(brew --prefix llvm@${MajorLLVMVer})/* $SVFHOME/$LLVMHome
         else
+            # Ubuntu if build_shared in ON,
+            if [[ "$BUILD_SHARED" == "ON" ]]; then
+                build_llvm_from_source
+            else
             # everything else downloads pre-built lib includ osx "arm64"
-            echo "Downloading LLVM binary for $OSDisplayName"
-            generic_download_file "$urlLLVM" llvm.tar.xz
-            check_xz
-            echo "Unzipping llvm package..."
-            mkdir -p "./$LLVMHome" && tar -xf llvm.tar.xz -C "./$LLVMHome" --strip-components 1
-            rm llvm.tar.xz
+              echo "Downloading LLVM binary for $OSDisplayName"
+              generic_download_file "$urlLLVM" llvm.tar.xz
+              check_xz
+              echo "Unzipping llvm package..."
+              mkdir -p "./$LLVMHome" && tar -xf llvm.tar.xz -C "./$LLVMHome" --strip-components 1
+              rm llvm.tar.xz
+            fi
         fi
     fi
     export LLVM_DIR="$SVFHOME/$LLVMHome"
@@ -253,7 +278,7 @@ mkdir "${BUILD_DIR}"
 cmake -D CMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}"   \
     -DSVF_ENABLE_ASSERTIONS:BOOL=true              \
     -DSVF_SANITIZE="${SVF_SANITIZER}"              \
-    -DBUILD_SHARED_LIBS=off                        \
+    -DBUILD_SHARED_LIBS=${BUILD_SHARED}            \
     -S "${SVFHOME}" -B "${BUILD_DIR}"
 cmake --build "${BUILD_DIR}" -j ${jobs}
 
@@ -265,4 +290,4 @@ source ${SVFHOME}/setup.sh ${BUILD_TYPE}
 #########
 # Optionally, you can also specify a CXX_COMPILER and your $LLVM_HOME for your build
 # cmake -DCMAKE_CXX_COMPILER=$LLVM_DIR/bin/clang++ -DLLVM_DIR=$LLVM_DIR
-#########
+#########

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1046",
+  "version": "1.0.1047",
   "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/lib/Graphs/BasicBlockG.cpp

@@ -1,4 +1,5 @@
 #include "Graphs/BasicBlockG.h"
+#include "Graphs/ICFGNode.h"
 
 using namespace SVF;
 const std::string BasicBlockEdge::toString() const
@@ -8,3 +9,16 @@ const std::string BasicBlockEdge::toString() const
     rawstr << "BasicBlockEdge: " << getSrcNode()->toString() << " -> " << getDstNode()->getName();
     return rawstr.str();
 }
+
+const std::string SVFBasicBlock::toString() const
+{
+    std::string str;
+    std::stringstream rawstr(str);
+    rawstr << "----------"<< "SVFBasicBlock: " << getName() <<"----------\n";
+    for (const ICFGNode* icfgNode : allICFGNodes)
+    {
+        rawstr << icfgNode->toString();
+    }
+    rawstr << "\n----------------------------------------\n";
+    return rawstr.str();
+}

package/svf-llvm/lib/LLVMUtil.cpp

@@ -763,19 +763,6 @@ std::string SVFLLVMValue::toString() const
     return rawstr.str();
 }
 
-const std::string SVFBasicBlock::toString() const
-{
-    std::string str;
-    llvm::raw_string_ostream rawstr(str);
-    auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
-    if (llvmVal)
-        rawstr << " " << *llvmVal << " ";
-    else
-        rawstr << " No llvmVal found";
-    rawstr << this->getSourceLoc();
-    return rawstr.str();
-}
-
 const std::string SVFValue::valueOnlyToString() const
 {
     std::string str;