svf-tools 1.0.686 → 1.0.688

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.686",
+  "version": "1.0.688",
   "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/Util/ExtAPI.cpp

@@ -164,7 +164,7 @@ ExtAPI* ExtAPI::getExtAPI(const std::string& path)
             root = parseJson(jsonFilePath, statbuf.st_size);
             return extOp;
         }
-        SVFUtil::errs() << "Failed to open any JsonFile for getExtAPI()\n";
+        SVFUtil::errs() << "No JsonFile found at " << jsonFilePath << " for getExtAPI() \n";
         abort();
     }
     return extOp;

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1421,16 +1421,24 @@ void SVFIRBuilder::handleExtCall(CallBase* cs, const Function *callee)
                         const Value* src = cs->getArgOperand(1);
                         if(const GetElementPtrInst* gep = SVFUtil::dyn_cast<GetElementPtrInst>(src))
                             src = stripConstantCasts(gep->getPointerOperand());
-                        if(const GlobalVariable* glob = SVFUtil::dyn_cast<GlobalVariable>(src))
+
+                        auto getHookFn = [](const Value* src)->const Function*
+                        {
+                            if (!SVFUtil::isa<GlobalVariable>(src))
+                                return nullptr;
+
+                            auto *glob = SVFUtil::cast<GlobalVariable>(src);
+                            if (!glob->hasInitializer() || !SVFUtil::isa<ConstantDataArray>(glob->getInitializer()))
+                                return nullptr;
+
+                            auto *constarray = SVFUtil::cast<ConstantDataArray>(glob->getInitializer());
+                            return LLVMUtil::getProgFunction(constarray->getAsCString().str());
+                        };
+
+                        if (const Function *fn = getHookFn(src))
                         {
-                            if(const ConstantDataArray* constarray = SVFUtil::dyn_cast<ConstantDataArray>(glob->getInitializer()))
-                            {
-                                if(const Function* fun = LLVMUtil::getProgFunction(constarray->getAsCString().str()))
-                                {
-                                    NodeID srcNode = getValueNode(fun);
-                                    addCopyEdge(srcNode,  getValueNode(cs));
-                                }
-                            }
+                            NodeID srcNode = getValueNode(fn);
+                            addCopyEdge(srcNode,  getValueNode(cs));
                         }
                     }
                     else if (op.getOperator() == "Rb_tree_ops")