svf-tools 1.0.726 → 1.0.728

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.726",
+  "version": "1.0.728",
   "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/include/SVFIR/SVFType.h

@@ -471,6 +471,12 @@ public:
     void print(std::ostream& OS) const override;
 };
 
+/// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
+/// Converts an SVFType to corresponding LLVM::Type, then get the string
+/// representation of it. Use it only when you are debugging. Don't use
+/// it in any SVF algorithm because it relies on information stored in LLVM bc.
+std::string dumpLLVMType(const SVFType* svfType);
+
 // TODO: be explicit that this is a pair of 32-bit unsigneds?
 template <> struct Hash<NodePair>
 {

package/svf/include/SVFIR/SVFValue.h

@@ -1140,6 +1140,12 @@ public:
     }
 };
 
+/// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
+/// Converts an SVFValue to corresponding LLVM::Value, then get the string
+/// representation of it. Use it only when you are debugging. Don't use
+/// it in any SVF algorithm because it relies on information stored in LLVM bc.
+std::string dumpLLVMValue(const SVFValue* svfValue);
+
 template <typename F, typename S>
 OutStream& operator<< (OutStream &o, const std::pair<F, S> &var)
 {

package/svf-llvm/lib/LLVMUtil.cpp

@@ -1027,25 +1027,40 @@ s32_t LLVMUtil::getVCallIdx(const CallBase* cs)
 namespace SVF
 {
 const std::string SVFValue::toString() const
+{
+    // TODO: Should only use info in SVFValue. Refactor it later.
+    return dumpLLVMValue(this);
+}
+
+std::string dumpLLVMValue(const SVFValue* svfValue)
 {
     std::string str;
     llvm::raw_string_ostream rawstr(str);
-    if (const SVF::SVFFunction* fun = SVFUtil::dyn_cast<SVFFunction>(this))
+    if (const SVF::SVFFunction* fun = SVFUtil::dyn_cast<SVFFunction>(svfValue))
     {
         rawstr << "Function: " << fun->getName() << " ";
     }
-    else if (const SVFBasicBlock* bb = SVFUtil::dyn_cast<SVFBasicBlock>(this))
+    else if (const SVFBasicBlock* bb = SVFUtil::dyn_cast<SVFBasicBlock>(svfValue))
     {
         rawstr << "BasicBlock: " << bb->getName() << " ";
     }
     else
     {
         const Value* val =
-            LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
+            LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(svfValue);
         rawstr << " " << *val << " ";
     }
-    rawstr << this->getSourceLoc();
+    rawstr << svfValue->getSourceLoc();
     return rawstr.str();
 }
 
+std::string dumpLLVMType(const SVFType* svfType)
+{
+    std::string str;
+    llvm::raw_string_ostream rawstr(str);
+    const Type* ty = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(svfType);
+    rawstr << *ty;
+    return rawstr.str();
 }
+
+} // namespace SVF

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

@@ -42,9 +42,10 @@ using namespace SVF;
 std::string replaceExtension(const std::string& path)
 {
     size_t pos = path.rfind('.');
-    if (pos == std::string::npos || path.substr(pos) != ".bc")
+    if (pos == std::string::npos ||
+            (path.substr(pos) != ".bc" && path.substr(pos) != ".ll"))
     {
-        SVFUtil::errs() << "Error: file extension is not .bc\n";
+        SVFUtil::errs() << "Error: expect file with extension .bc or .ll\n";
         exit(EXIT_FAILURE);
     }
     return path.substr(0, pos) + ".svf.json";