svf-tools 1.0.1107 → 1.0.1109

package/CMakeLists.txt

@@ -91,11 +91,8 @@ option(SVF_DEBUG_INFO "Enable & explicitly preserve debug info (-g3); also in re
 option(SVF_WARN_AS_ERROR "Treat all compiler warnings as errors when building SVF (default: on)" ON)
 option(SVF_EXPORT_DYNAMIC "Export all (not only the actually used) symbols to dynamic symbol table" OFF)
 option(SVF_ENABLE_ASSERTIONS "Always enable debugging assertions, also if the build type is a release build")
-option(SVF_ENABLE_RTTI "Disables runtime type information generation by adding the -fno-rtti build flag" ON)
-option(SVF_ENABLE_EH "Disables handling of thrown exceptions by adding the -fno-exceptions build flag" ON)
-
-# For convenience, also declare SVF_ENABLE_EXCEPTIONS as a local variable (for config)
-set(SVF_ENABLE_EXCEPTIONS ${SVF_ENABLE_EH})
+option(SVF_ENABLE_RTTI "Adds -fno-rtti to disable runtime type information (RTTI)" OFF)
+option(SVF_ENABLE_EXCEPTIONS "Adds -fno-exceptions to disable exception handling" OFF)
 
 # If building dynamic libraries, always enable PIC
 if(SVF_SHARED_LIBS AND NOT SVF_USE_PIC)
@@ -184,7 +181,7 @@ message(
 
   SVF option - Build type:                          ${SVF_BUILD_TYPE}
   SVF option - Building shared libs:                ${SVF_SHARED_LIBS}
-  SVF option - Enabled exception handling:          ${SVF_ENABLE_EH}
+  SVF option - Enabled exception handling:          ${SVF_ENABLE_EXCEPTIONS}
   SVF option - Enabled runtime type information:    ${SVF_ENABLE_RTTI}
   SVF option - Enabling position-independent code:  ${SVF_USE_PIC}
   SVF option - Enabling link-time optimisations:    ${SVF_USE_LTO}
@@ -304,7 +301,7 @@ target_compile_options(
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_WARN_AS_ERROR}>:-Werror>>
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_WARN_AS_ERROR}>:-Wno-deprecated-declarations>>
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_ENABLE_ASSERTIONS}>:-UNDEBUG>>
-  INTERFACE $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${SVF_ENABLE_EH}>>:-fno-exceptions>>
+  INTERFACE $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${SVF_ENABLE_EXCEPTIONS}>>:-fno-exceptions>>
   INTERFACE $<BUILD_INTERFACE:$<$<OR:$<BOOL:${SVF_COVERAGE}>,$<BOOL:$ENV{SVF_COVERAGE}>>:-fprofile-arcs>>
   INTERFACE $<BUILD_INTERFACE:$<$<OR:$<BOOL:${SVF_COVERAGE}>,$<BOOL:$ENV{SVF_COVERAGE}>>:-ftest-coverage>>
   INTERFACE $<BUILD_INTERFACE:$<$<STREQUAL:${SVF_SANITIZE},thread>:-fsanitize=thread>>
@@ -321,7 +318,7 @@ target_link_options(
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_EXPORT_DYNAMIC}>:-rdynamic>>
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_EXPORT_DYNAMIC}>:-Wl,--export-dynamic>>
   INTERFACE $<BUILD_INTERFACE:$<$<BOOL:${SVF_ENABLE_ASSERTIONS}>:-UNDEBUG>>
-  INTERFACE $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${SVF_ENABLE_EH}>>:-fno-exceptions>>
+  INTERFACE $<BUILD_INTERFACE:$<$<NOT:$<BOOL:${SVF_ENABLE_EXCEPTIONS}>>:-fno-exceptions>>
   INTERFACE $<BUILD_INTERFACE:$<$<OR:$<BOOL:${SVF_COVERAGE}>,$<BOOL:$ENV{SVF_COVERAGE}>>:-fprofile-arcs>>
   INTERFACE $<BUILD_INTERFACE:$<$<OR:$<BOOL:${SVF_COVERAGE}>,$<BOOL:$ENV{SVF_COVERAGE}>>:-ftest-coverage>>
   INTERFACE $<BUILD_INTERFACE:$<$<STREQUAL:${SVF_SANITIZE},thread>:-fsanitize=thread>>
@@ -340,8 +337,8 @@ install(FILES ${SVF_BINARY_DIR}/include/Util/config.h DESTINATION ${SVF_INSTALL_
 # SVF pkgconf package configuration
 # =================================================================================
 
-configure_file(cmake/SVF.pc.in ${SVF_BINARY_DIR}/SVF.pc @ONLY)
-install(FILES ${SVF_BINARY_DIR}/SVF.pc DESTINATION ${SVF_INSTALL_PKGCONFDIR})
+configure_file(cmake/SVF.pc.in ${SVF_BINARY_DIR}/lib/pkgconfig/SVF.pc @ONLY)
+install(FILES ${SVF_BINARY_DIR}/lib/pkgconfig/SVF.pc DESTINATION ${SVF_INSTALL_PKGCONFDIR})
 
 # =================================================================================
 # SVF CMake package configuration
@@ -351,7 +348,7 @@ install(FILES ${SVF_BINARY_DIR}/SVF.pc DESTINATION ${SVF_INSTALL_PKGCONFDIR})
 export(
   EXPORT SVFTargets
   NAMESPACE SVF::
-  FILE ${SVF_BINARY_DIR}/SVFTargets.cmake
+  FILE ${SVF_BINARY_DIR}/lib/cmake/SVF/SVFTargets.cmake
 )
 
 # Install the SVFTargets.cmake file along with the package
@@ -363,7 +360,7 @@ install(
 
 # Create the CMake configuration file (to find SVF with find_package(SVF))
 configure_package_config_file(
-  cmake/SVFConfig.cmake.in ${SVF_BINARY_DIR}/SVFConfig.cmake
+  cmake/SVFConfig.cmake.in ${SVF_BINARY_DIR}/lib/cmake/SVF/SVFConfig.cmake
   INSTALL_DESTINATION ${SVF_INSTALL_CMAKECONFIGDIR}
   PATH_VARS SVF_INSTALL_BINDIR
             SVF_INSTALL_LIBDIR
@@ -376,16 +373,17 @@ configure_package_config_file(
 
 # Create the CMake version configuration package (to support finding specific SVF versions)
 write_basic_package_version_file(
-  ${SVF_BINARY_DIR}/SVFConfigVersion.cmake
+  ${SVF_BINARY_DIR}/lib/cmake/SVF/SVFConfigVersion.cmake
   VERSION ${SVF_VERSION}
   COMPATIBILITY AnyNewerVersion
 )
 
 # Install the generated configuration files
-install(FILES ${SVF_BINARY_DIR}/SVFConfig.cmake DESTINATION ${SVF_INSTALL_CMAKECONFIGDIR})
-install(FILES ${SVF_BINARY_DIR}/SVFConfigVersion.cmake DESTINATION ${SVF_INSTALL_CMAKECONFIGDIR})
+install(FILES ${SVF_BINARY_DIR}/lib/cmake/SVF/SVFConfig.cmake DESTINATION ${SVF_INSTALL_CMAKECONFIGDIR})
+install(FILES ${SVF_BINARY_DIR}/lib/cmake/SVF/SVFConfigVersion.cmake DESTINATION ${SVF_INSTALL_CMAKECONFIGDIR})
 
 # Also install the extra module finding package definitions (e.g., FindZ3.cmake)
+configure_file(cmake/Modules/FindZ3.cmake ${SVF_BINARY_DIR}/lib/cmake/SVF/FindZ3.cmake @ONLY)
 install(
   DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules"
   DESTINATION "${SVF_INSTALL_CMAKECONFIGDIR}"

package/cmake/SVFConfig.cmake.in

@@ -29,7 +29,6 @@ set(SVF_EXPORT_DYNAMIC @SVF_EXPORT_DYNAMIC@)
 set(SVF_ENABLE_ASSERTIONS @SVF_ENABLE_ASSERTIONS@)
 set(SVF_ENABLE_EXCEPTIONS @SVF_ENABLE_EXCEPTIONS@)
 set(SVF_ENABLE_RTTI @SVF_ENABLE_RTTI@)
-set(SVF_ENABLE_EH @SVF_ENABLE_EH@)
 
 # Set the basic SVF paths based on the installed location (relocatable)
 set_and_check(SVF_INSTALL_ROOT "${PACKAGE_PREFIX_DIR}")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1107",
+  "version": "1.0.1109",
   "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-llvm/CMakeLists.txt

@@ -10,11 +10,11 @@ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 include(AddLLVM)
 
 # If exceptions are disabled, verify the LLVM instance could never raise them
-if(LLVM_ENABLE_EH AND NOT SVF_ENABLE_EH)
+if(LLVM_ENABLE_EH AND NOT SVF_ENABLE_EXCEPTIONS)
   message(WARNING "LLVM could throw exceptions but SVF configured to disable exception handling; "
-                  "forcing $SVF_ENABLE_EH to ON!"
+                  "forcing $SVF_ENABLE_EXCEPTIONS to ON!"
   )
-  set(SVF_ENABLE_EH
+  set(SVF_ENABLE_EXCEPTIONS
       ON
       CACHE BOOL "" FORCE
   )