svf-tools 1.0.337 → 1.0.341

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -52,20 +52,20 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
 
     StInfo::setMaxFieldLimit(Options::MaxFieldLimit);
 
-    // Object #0 is black hole the object that may point to any object
+    // Pointer #0 always represents the null pointer.
+    assert(symInfo->totalSymNum++ == SymbolTableInfo::NullPtr && "Something changed!");
+
+    // Pointer #1 always represents the pointer points-to black hole.
+    assert(symInfo->totalSymNum++ == SymbolTableInfo::BlkPtr && "Something changed!");
+
+    // Object #2 is black hole the object that may point to any object
     assert(symInfo->totalSymNum++ == SymbolTableInfo::BlackHole && "Something changed!");
     symInfo->createBlkObj(SymbolTableInfo::BlackHole);
 
-    // Object #1 always represents the constant
+    // Object #3 always represents the unique constant of a program (merging all constants if Options::ModelConsts is disabled)
     assert(symInfo->totalSymNum++ == SymbolTableInfo::ConstantObj && "Something changed!");
     symInfo->createConstantObj(SymbolTableInfo::ConstantObj);
 
-    // Pointer #2 always represents the pointer points-to black hole.
-    assert(symInfo->totalSymNum++ == SymbolTableInfo::BlkPtr && "Something changed!");
-
-    // Pointer #3 always represents the null pointer.
-    assert(symInfo->totalSymNum++ == SymbolTableInfo::NullPtr && "Something changed!");
-
     // Add symbols for all the globals .
     for (SVFModule::global_iterator I = svfModule->global_begin(), E =
                 svfModule->global_end(); I != E; ++I)
@@ -567,7 +567,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
     {
         typeinfo->setFlag(ObjTypeInfo::GLOBVAR_OBJ);
         if(SymbolTableInfo::SymbolInfo()->isConstantObjSym(val))
-            typeinfo->setFlag(ObjTypeInfo::CONST_OBJ);
+            typeinfo->setFlag(ObjTypeInfo::CONST_GLOBAL_OBJ);
         analyzeGlobalStackObjType(typeinfo,val);
         objSize = getObjSize(val);
     }
@@ -591,7 +591,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
     }
     else if(SVFUtil::isConstantData(val))
     {
-        typeinfo->setFlag(ObjTypeInfo::CONST_OBJ);
+        typeinfo->setFlag(ObjTypeInfo::CONST_DATA);
     }
     else{
         assert("what other object do we have??");

package/lib/Util/PTAStat.cpp

@@ -170,13 +170,13 @@ void PTAStat::performStat()
                 numOfHasVarArray++;
             if(mem->isVarStruct())
                 numOfHasVarStruct++;
-            if(mem->isConstArray())
+            if(mem->isConstantArray())
                 numOfHasConstArray++;
-            if(mem->isConstStruct())
+            if(mem->isConstantStruct())
                 numOfHasConstStruct++;
             if(mem->hasPtrObj() == false)
                 numOfScalar++;
-            if(mem->isConstant())
+            if(mem->isConstDataOrConstGlobal())
                 numOfConstant++;
 
             if (mem->isFieldInsensitive())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.337",
+  "version": "1.0.341",
   "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": {