svf-tools 1.0.1188 → 1.0.1189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1188",
+  "version": "1.0.1189",
   "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/lib/CppUtil.cpp

@@ -529,12 +529,16 @@ const Argument* cppUtil::getConstructorThisPtr(const Function* fun)
 {
     assert((isConstructor(fun) || isDestructor(fun)) &&
            "not a constructor?");
-    assert(fun->arg_size() >= 1 && "argument size >= 1?");
+    // We always need at least one argument to return something meaningful.
+    assert(fun->arg_size() >= 1 && "expected at least one argument");
+
+    // If param 0 is sret, 'this' is typically param 1, but be defensive.
     const bool isStructRet = fun->hasParamAttribute(0, llvm::Attribute::StructRet);
-    assert((isStructRet ? fun->arg_size() >= 2 : true) &&
-           "argument size for struct ret constructor >= 2?");
-    const Argument* thisPtr = isStructRet ?
-                              fun->getArg(1) : fun->getArg(0);
+
+    // Prefer arg1 when sret is present and available; otherwise fall back to arg0.
+    const u32_t thisIdx = (isStructRet && fun->arg_size() >= 2) ? 1 : 0;
+    const Argument* thisPtr = fun->getArg(thisIdx);
+
     return thisPtr;
 }