svf-tools 1.0.970 → 1.0.971

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.970",
+  "version": "1.0.971",
   "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/include/SVF-LLVM/CppUtil.h

@@ -53,6 +53,9 @@ struct DemangledName
 
 struct DemangledName demangle(const std::string& name);
 
+
+Set<std::string> getClsNamesInBrackets(const std::string& name);
+
 std::string getBeforeBrackets(const std::string& name);
 std::string getClassNameFromVtblObj(const std::string& vtblName);
 

package/svf-llvm/lib/CppUtil.cpp

@@ -236,6 +236,71 @@ struct cppUtil::DemangledName cppUtil::demangle(const std::string& name)
 
     return dname;
 }
+
+// Extract class name in parameters
+// e.g., given "WithSemaphore::WithSemaphore(AP_HAL::Semaphore&)", return "AP_HAL::Semaphore"
+Set<std::string> cppUtil::getClsNamesInBrackets(const std::string& name)
+{
+    Set<std::string> res;
+    // Lambda to trim whitespace from both ends of a string
+    auto trim = [](std::string& s)
+    {
+        size_t first = s.find_first_not_of(' ');
+        size_t last = s.find_last_not_of(' ');
+        if (first != std::string::npos && last != std::string::npos)
+        {
+            s = s.substr(first, (last - first + 1));
+        }
+        else
+        {
+            s.clear();
+        }
+    };
+
+    // Lambda to remove trailing '*' and '&' characters
+    auto removePointerAndReference = [](std::string& s)
+    {
+        while (!s.empty() && (s.back() == '*' || s.back() == '&'))
+        {
+            s.pop_back();
+        }
+    };
+
+    s32_t status;
+    char* realname = abi::__cxa_demangle(name.c_str(), 0, 0, &status);
+    if (realname == nullptr)
+    {
+        // do nothing
+    }
+    else
+    {
+        std::string realnameStr = std::string(realname);
+
+        // Find the start and end of the parameter list
+        size_t start = realnameStr.find('(');
+        size_t end = realnameStr.find(')');
+        if (start == std::string::npos || end == std::string::npos || start >= end)
+        {
+            return res; // Return empty set if the format is incorrect
+        }
+
+        // Extract the parameter list
+        std::string paramList = realnameStr.substr(start + 1, end - start - 1);
+
+        // Split the parameter list by commas
+        std::istringstream ss(paramList);
+        std::string param;
+        while (std::getline(ss, param, ','))
+        {
+            trim(param);
+            removePointerAndReference(param);
+            res.insert(param);
+        }
+        std::free(realname);
+    }
+    return res;
+}
+
 std::string cppUtil::getClassNameFromVtblObj(const std::string& vtblName)
 {
     std::string className = "";
@@ -646,7 +711,10 @@ Set<std::string> cppUtil::extractClsNamesFromFunc(const Function *foo)
     {
         // c++ constructor or destructor
         DemangledName demangledName = cppUtil::demangle(name);
-        return {demangledName.className};
+        Set<std::string> clsNameInBrackets =
+            cppUtil::getClsNamesInBrackets(name);
+        clsNameInBrackets.insert(demangledName.className);
+        return clsNameInBrackets;
     }
     else if (isTemplateFunc(foo))
     {