svf-tools 1.0.694 → 1.0.696

package/svf/lib/SVFIR/SVFModuleRW.cpp

@@ -816,14 +816,14 @@ SVFModule* SVFModuleRead::readSvfModule(cJSON* iter)
 
     // Fill incomplete values in valuePool and typePool
     for (size_t i = 0; i < typePool.size(); ++i)
-        fillSvfTypeAt(i);
+        fillSVFTypeAt(i);
     for (size_t i = 0; i < valuePool.size(); ++i)
-        fillSvfValueAt(i);
+        fillSVFValueAt(i);
 
     return svfModule;
 }
 
-void SVFModuleRead::fillSvfTypeAt(size_t i)
+void SVFModuleRead::fillSVFTypeAt(size_t i)
 {
     cJSON* childIter = typeArray[i]->child;
     SVFType* type = typePool[i];
@@ -833,7 +833,7 @@ void SVFModuleRead::fillSvfTypeAt(size_t i)
     {
     default:
         SVFUtil::errs() << "Impossible SVFType kind " << kind
-                        << " in fillSvfTypeAt()\n";
+                        << " in fillSVFTypeAt()\n";
         assert(false);
 
 #define CASE(Kind)                                                             \
@@ -854,7 +854,7 @@ void SVFModuleRead::fillSvfTypeAt(size_t i)
     }
 }
 
-void SVFModuleRead::fillSvfValueAt(size_t i)
+void SVFModuleRead::fillSVFValueAt(size_t i)
 {
     cJSON* childIter = valueArray[i]->child;
     SVFValue* value = valuePool[i];
@@ -863,7 +863,7 @@ void SVFModuleRead::fillSvfValueAt(size_t i)
     {
     default:
         SVFUtil::errs() << "Impossible SVFValue kind " << kind
-                        << " in fillSvfValueAt()\n";
+                        << " in fillSVFValueAt()\n";
         assert(false);
 
 #define CASE(kind, type)                                                       \

package/svf/lib/SVFIR/SymbolTableInfo.cpp

@@ -153,7 +153,7 @@ void SymbolTableInfo::destroy()
         delete type;
     svfTypes.clear();
 
-    for (StInfo* st : stInfos)
+    for (const StInfo* st : stInfos)
         delete st;
     stInfos.clear();
 

package/svf/lib/Util/Options.cpp

@@ -322,6 +322,12 @@ const Option<std::string> Options::DumpJson(
     ""
 );
 
+const Option<bool> Options::ReadJson(
+    "read-json",
+    "Read the SVFIR in JSON format",
+    false
+);
+
 const Option<bool> Options::CallGraphDotGraph(
     "dump-callgraph",
     "Dump dot graph of Call Graph",
@@ -867,4 +873,4 @@ const Option<u32_t> Options::LoopBound(
     1
 );
 
-} // namespace SVF.
+} // namespace SVF.

package/svf-llvm/lib/LLVMModule.cpp

@@ -101,7 +101,7 @@ SVFModule* LLVMModuleSet::buildSVFModule(const std::vector<std::string> &moduleN
 
     loadModules(moduleNameVec);
 
-    if(!moduleNameVec.empty())
+    if (!moduleNameVec.empty())
         svfModule = std::make_unique<SVFModule>(*moduleNameVec.begin());
     else
         svfModule = std::make_unique<SVFModule>();

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -730,7 +730,7 @@ void SVFIRBuilder::visitCastInst(CastInst &inst)
     }
     else
     {
-        const Value*  opnd = inst.getOperand(0);
+        const Value* opnd = inst.getOperand(0);
         if (!SVFUtil::isa<PointerType>(opnd->getType()))
             opnd = stripAllCasts(opnd);
 

package/svf-llvm/tools/CMakeLists.txt

@@ -20,3 +20,4 @@ add_subdirectory(Example)
 add_subdirectory(DDA)
 add_subdirectory(MTA)
 add_subdirectory(CFL)
+add_subdirectory(LLVM2SVF)

package/svf-llvm/tools/LLVM2SVF/CMakeLists.txt

@@ -0,0 +1,10 @@
+if(DEFINED IN_SOURCE_BUILD)
+  add_llvm_tool(llvm2svf llvm2svf.cpp)
+else()
+  add_executable(llvm2svf llvm2svf.cpp)
+
+  target_link_libraries(llvm2svf SvfLLVM ${llvm_libs})
+
+  set_target_properties(llvm2svf PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                       ${CMAKE_BINARY_DIR}/bin)
+endif()

package/svf-llvm/tools/LLVM2SVF/llvm2svf.cpp

@@ -0,0 +1,72 @@
+//===- llvm2svf.cpp -- LLVM IR to SVF IR conversion  -------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2023>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===-----------------------------------------------------------------------===//
+
+/*
+ * llvm2svf.cpp
+ *
+ *  Created on: 21 Apr 2023
+ *     Authors: Xudong Wang
+ */
+
+#include "SVF-LLVM/SVFIRBuilder.h"
+#include "Util/CommandLine.h"
+#include "Util/Options.h"
+#include "SVFIR/SVFIRRW.h"
+
+
+using namespace std;
+using namespace SVF;
+
+#include <iostream>
+#include <string>
+
+std::string replaceExtension(const std::string& path)
+{
+    size_t pos = path.rfind('.');
+    if (pos == std::string::npos || path.substr(pos) != ".bc")
+    {
+        SVFUtil::errs() << "Error: file extension is not .bc\n";
+        exit(EXIT_FAILURE);
+    }
+    return path.substr(0, pos) + ".svf.json";
+}
+
+int main(int argc, char** argv)
+{
+    auto moduleNameVec = OptionBase::parseOptions(
+                             argc, argv, "llvm2svf", "[options] <input-bitcode...>");
+
+    LLVMModuleSet* moduleSet = LLVMModuleSet::getLLVMModuleSet();
+    if (Options::WriteAnder() == "ir_annotator")
+    {
+        moduleSet->preProcessBCs(moduleNameVec);
+    }
+
+    SVFModule* svfModule = moduleSet->buildSVFModule(moduleNameVec);
+    const std::string jsonPath = replaceExtension(moduleNameVec.front());
+    // PAG is borrowed from a unique_ptr, so we don't need to delete it.
+    const SVFIR* pag = SVFIRBuilder(svfModule).build();
+    SVFIRWriter::writeJsonToPath(pag, jsonPath);
+    SVFUtil::outs() << "SVF IR is written to '" << jsonPath << "'\n";
+
+    return 0;
+}

package/svf-llvm/tools/WPA/wpa.cpp

@@ -31,8 +31,6 @@
 #include "WPA/WPAPass.h"
 #include "Util/CommandLine.h"
 #include "Util/Options.h"
-
-
 #include "SVFIR/SVFIRRW.h"
 
 
@@ -42,28 +40,33 @@ using namespace SVF;
 
 int main(int argc, char** argv)
 {
-
-    char** arg_value = new char*[argc];
-    std::vector<std::string> moduleNameVec;
-    moduleNameVec =
+    auto moduleNameVec =
         OptionBase::parseOptions(argc, argv, "Whole Program Points-to Analysis",
                                  "[options] <input-bitcode...>");
 
-    if (Options::WriteAnder() == "ir_annotator")
+    SVFIR* pag;
+
+    if (Options::ReadJson())
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        pag = SVFIRReader::read(moduleNameVec.front());
     }
+    else
+    {
+        LLVMModuleSet* moduleSet = LLVMModuleSet::getLLVMModuleSet();
+        if (Options::WriteAnder() == "ir_annotator")
+        {
+            moduleSet->preProcessBCs(moduleNameVec);
+        }
 
-    SVFModule* svfModule =
-        LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+        SVFModule* svfModule = moduleSet->buildSVFModule(moduleNameVec);
 
-    /// Build SVFIR
-    SVFIRBuilder builder(svfModule);
-    SVFIR* pag = builder.build();
+        /// Build SVFIR
+        SVFIRBuilder builder(svfModule);
+        pag = builder.build();
+    }
 
     WPAPass wpa;
     wpa.runOnModule(pag);
 
-    delete[] arg_value;
     return 0;
 }