svf-tools 1.0.571 → 1.0.573

package/SVF-doxygen/html/html/search/all_f.js

@@ -66,7 +66,7 @@ var searchData=
   ['opver',['opVer',['../classSVF_1_1MSSACHI.html#a86f2f3f6e2215cdbe31caee048510757',1,'SVF::MSSACHI']]],
   ['opverbegin',['opVerBegin',['../classSVF_1_1MSSAPHISVFGNode.html#ace39549f7e300cb4a0ac7b8506a8632a',1,'SVF::MSSAPHISVFGNode::opVerBegin()'],['../classSVF_1_1IntraMSSAPHISVFGNode.html#aff4e88ef6569d3c4f29b532d610cd2b9',1,'SVF::IntraMSSAPHISVFGNode::opVerBegin()'],['../classSVF_1_1CmpVFGNode.html#a78fb624f0ca9ff16e6a8e5fd1c384904',1,'SVF::CmpVFGNode::opVerBegin()'],['../classSVF_1_1BinaryOPVFGNode.html#adaff45c46c4cc8158bd3147d304deab5',1,'SVF::BinaryOPVFGNode::opVerBegin()'],['../classSVF_1_1UnaryOPVFGNode.html#ab63ddaa05181f2c60ca7a001001a908d',1,'SVF::UnaryOPVFGNode::opVerBegin()'],['../classSVF_1_1PHIVFGNode.html#a2e00f6d582aa4ac9aa116cc6d5c79369',1,'SVF::PHIVFGNode::opVerBegin()'],['../classSVF_1_1MSSAPHI.html#a940f9afa26bf54c7175276ea27003c2f',1,'SVF::MSSAPHI::opVerBegin()']]],
   ['opverend',['opVerEnd',['../classSVF_1_1MSSAPHISVFGNode.html#a33ec42a011781bbb63dce6dbe5f88bdf',1,'SVF::MSSAPHISVFGNode::opVerEnd()'],['../classSVF_1_1IntraMSSAPHISVFGNode.html#a5e78faceb497b0f3cb6f8f1a9fc4f799',1,'SVF::IntraMSSAPHISVFGNode::opVerEnd()'],['../classSVF_1_1CmpVFGNode.html#ae5ba94ffae500168f0e5c1b1ce78af9c',1,'SVF::CmpVFGNode::opVerEnd()'],['../classSVF_1_1BinaryOPVFGNode.html#aed5a32d1a145df7007ba7d934e4c2bd4',1,'SVF::BinaryOPVFGNode::opVerEnd()'],['../classSVF_1_1UnaryOPVFGNode.html#af31a06d33f41bdcff625ac23e269708c',1,'SVF::UnaryOPVFGNode::opVerEnd()'],['../classSVF_1_1PHIVFGNode.html#add18c60773871744123d12a037e78e20',1,'SVF::PHIVFGNode::opVerEnd()'],['../classSVF_1_1MultiOpndStmt.html#ad53097d07487d564e7d13f9d7d9ab10c',1,'SVF::MultiOpndStmt::opVerEnd()'],['../classSVF_1_1MSSAPHI.html#a2a49ad9d2eedf1dea98d725b13878d88',1,'SVF::MSSAPHI::opVerEnd()']]],
-  ['opvers',['OPVers',['../classSVF_1_1MSSAPHISVFGNode.html#a300f37203eb84fc57e005c27ce0422fb',1,'SVF::MSSAPHISVFGNode::OPVers()'],['../classSVF_1_1CmpVFGNode.html#a0db4ada3c366c811962415454a859b22',1,'SVF::CmpVFGNode::OPVers()'],['../classSVF_1_1BinaryOPVFGNode.html#a880c8260e3acb3fbe431446f2c1f5990',1,'SVF::BinaryOPVFGNode::OPVers()'],['../classSVF_1_1UnaryOPVFGNode.html#af96b598342bbcbcd739e2603acfc5a41',1,'SVF::UnaryOPVFGNode::OPVers()'],['../classSVF_1_1PHIVFGNode.html#a44ba5254e5f4def007c99916cd58668c',1,'SVF::PHIVFGNode::OPVers()'],['../classSVF_1_1MSSAPHI.html#a622892bb1c3c151e646ae1a46838c3ba',1,'SVF::MSSAPHI::OPVers()'],['../classSVF_1_1MSSAPHISVFGNode.html#a9c327923ab939e06877441ebde5c1139',1,'SVF::MSSAPHISVFGNode::opVers()'],['../classSVF_1_1CmpVFGNode.html#aae30d80fd848d62467476d21c691573c',1,'SVF::CmpVFGNode::opVers()'],['../classSVF_1_1BinaryOPVFGNode.html#ae803603f567cc28f5a7e1b66fb324cbc',1,'SVF::BinaryOPVFGNode::opVers()'],['../classSVF_1_1UnaryOPVFGNode.html#ae6fdb5759a0dfeb0635ffd758b752dc1',1,'SVF::UnaryOPVFGNode::opVers()'],['../classSVF_1_1PHIVFGNode.html#a08ccd55d0fb6ce33f69959349008daca',1,'SVF::PHIVFGNode::opVers()'],['../classSVF_1_1MSSAPHI.html#abdabd6dff67cd59622f18d48e8b34271',1,'SVF::MSSAPHI::opVers()']]],
+  ['opvers',['opVers',['../classSVF_1_1MSSAPHISVFGNode.html#a9c327923ab939e06877441ebde5c1139',1,'SVF::MSSAPHISVFGNode::opVers()'],['../classSVF_1_1CmpVFGNode.html#aae30d80fd848d62467476d21c691573c',1,'SVF::CmpVFGNode::opVers()'],['../classSVF_1_1BinaryOPVFGNode.html#ae803603f567cc28f5a7e1b66fb324cbc',1,'SVF::BinaryOPVFGNode::opVers()'],['../classSVF_1_1UnaryOPVFGNode.html#ae6fdb5759a0dfeb0635ffd758b752dc1',1,'SVF::UnaryOPVFGNode::opVers()'],['../classSVF_1_1PHIVFGNode.html#a08ccd55d0fb6ce33f69959349008daca',1,'SVF::PHIVFGNode::opVers()'],['../classSVF_1_1MSSAPHI.html#abdabd6dff67cd59622f18d48e8b34271',1,'SVF::MSSAPHI::opVers()'],['../classSVF_1_1MSSAPHISVFGNode.html#a300f37203eb84fc57e005c27ce0422fb',1,'SVF::MSSAPHISVFGNode::OPVers()'],['../classSVF_1_1CmpVFGNode.html#a0db4ada3c366c811962415454a859b22',1,'SVF::CmpVFGNode::OPVers()'],['../classSVF_1_1BinaryOPVFGNode.html#a880c8260e3acb3fbe431446f2c1f5990',1,'SVF::BinaryOPVFGNode::OPVers()'],['../classSVF_1_1UnaryOPVFGNode.html#af96b598342bbcbcd739e2603acfc5a41',1,'SVF::UnaryOPVFGNode::OPVers()'],['../classSVF_1_1PHIVFGNode.html#a44ba5254e5f4def007c99916cd58668c',1,'SVF::PHIVFGNode::OPVers()'],['../classSVF_1_1MSSAPHI.html#a622892bb1c3c151e646ae1a46838c3ba',1,'SVF::MSSAPHI::OPVers()']]],
   ['or',['OR',['../classSVF_1_1Z3Expr.html#ac063ed06c3495b790c02fe57c781b34e',1,'SVF::Z3Expr']]],
   ['orderedmap',['OrderedMap',['../namespaceSVF.html#aedf0d6718ca176e0b9e17ab4b30729c6',1,'SVF']]],
   ['orderednodeset',['OrderedNodeSet',['../namespaceSVF.html#a3c2bd95727ec0d9c55c631b6617026c8',1,'SVF']]],

package/SVF-doxygen/html/html/search/functions_10.js

@@ -42,6 +42,7 @@ var searchData=
   ['removecxtstmttospan',['removeCxtStmtToSpan',['../classSVF_1_1LockAnalysis.html#a0b21446e6d5dfc1b5d0ebd75895225dd',1,'SVF::LockAnalysis']]],
   ['removedirectedge',['removeDirectEdge',['../classSVF_1_1ConstraintGraph.html#a9fc73676ea133651604e2528fe1d8244',1,'SVF::ConstraintGraph']]],
   ['removedpmfromloc',['removeDpmFromLoc',['../classSVF_1_1DDAVFSolver.html#a00ae738a76564b7b334faae567674e34',1,'SVF::DDAVFSolver']]],
+  ['removefirstsymbol',['removeFirstSymbol',['../classSVF_1_1CFGNormalizer.html#afd29c476dad9728a10e19561e846f97e',1,'SVF::CFGNormalizer']]],
   ['removefront',['removeFront',['../classSVF_1_1FIFOWorkList.html#a621fe65af285665396fa10af9f96ef3a',1,'SVF::FIFOWorkList']]],
   ['removegnode',['removeGNode',['../classSVF_1_1GenericGraph.html#a1817b65e76052f11e36a67d6b9efd915',1,'SVF::GenericGraph']]],
   ['removeicfgedge',['removeICFGEdge',['../classSVF_1_1ICFG.html#a534625b10673efe5b0f344bfebf9b3cf',1,'SVF::ICFG']]],

package/SVF-doxygen/html/html/search/functions_11.js

@@ -167,7 +167,7 @@ var searchData=
   ['stripqualifiers',['stripQualifiers',['../classSVF_1_1DCHGraph.html#a175ed6ad0c9b23d5617f755ab96c76c4',1,'SVF::DCHGraph']]],
   ['stripspace',['stripSpace',['../classSVF_1_1GrammarBuilder.html#a6de372fbe80d33a5688cada0adca0bb8',1,'SVF::GrammarBuilder']]],
   ['strongupdateoutfromin',['strongUpdateOutFromIn',['../classSVF_1_1FlowSensitive.html#a8ebe4342c1496b906ee1b6450558c3e8',1,'SVF::FlowSensitive']]],
-  ['strtrans',['strTrans',['../classSVF_1_1CFGNormalizer.html#adbd98b8ece3c8234d5791fab47dcdbf9',1,'SVF::CFGNormalizer']]],
+  ['strtrans',['strTrans',['../classSVF_1_1CFGNormalizer.html#a4b9b6c676ce6514ae725f543b1e07acf',1,'SVF::CFGNormalizer']]],
   ['subnodes',['subNodes',['../classSVF_1_1SCCDetection_1_1GNodeSCCInfo.html#a48981e6555ad221d08f16ed2df708027',1,'SVF::SCCDetection::GNodeSCCInfo::subNodes()'],['../classSVF_1_1SCCDetection_1_1GNodeSCCInfo.html#aa2b23b22bb0304ce07ab9b14f0fdc395',1,'SVF::SCCDetection::GNodeSCCInfo::subNodes() const'],['../classSVF_1_1SCCDetection.html#a6ab5eff6a576e6d8703c1ea29b7f425d',1,'SVF::SCCDetection::subNodes()']]],
   ['sucmsg',['sucMsg',['../namespaceSVF_1_1SVFUtil.html#a6a55f1f8598998a3ffbbc67d32eaf8c4',1,'SVF::SVFUtil']]],
   ['suffix_5fobject',['suffix_object',['../cJSON_8cpp.html#a5d61bcc0045ace88c2ae04f0928eeace',1,'cJSON.cpp']]],
@@ -179,7 +179,7 @@ var searchData=
   ['svfgnodelockspan',['SVFGNodeLockSpan',['../classSVF_1_1SVFGNodeLockSpan.html#a43f4d595b31259576b141cb99883938e',1,'SVF::SVFGNodeLockSpan']]],
   ['svfgopt',['SVFGOPT',['../classSVF_1_1SVFGOPT.html#a239475c15b39d54c632427307b8e9350',1,'SVF::SVFGOPT']]],
   ['svfgsccdetection',['SVFGSCCDetection',['../classSVF_1_1DDAVFSolver.html#aba0ec611a5cfd096ac0b8b11e0bd5580',1,'SVF::DDAVFSolver']]],
-  ['svfgstat',['SVFGStat',['../classSVF_1_1SVFGStat.html#ae61d5bd92ef495a0f6c2f9dedac3da03',1,'SVF::SVFGStat::SVFGStat()'],['../classSVF_1_1FlowSensitive.html#a5f015d8f2b0956306822172d02b415c3',1,'SVF::FlowSensitive::svfgStat()']]],
+  ['svfgstat',['svfgStat',['../classSVF_1_1FlowSensitive.html#a5f015d8f2b0956306822172d02b415c3',1,'SVF::FlowSensitive::svfgStat()'],['../classSVF_1_1SVFGStat.html#ae61d5bd92ef495a0f6c2f9dedac3da03',1,'SVF::SVFGStat::SVFGStat()']]],
   ['svfir',['SVFIR',['../classSVF_1_1SVFIR.html#abf511f82cdbf7a6d9b6da167aee57636',1,'SVF::SVFIR']]],
   ['svfirbuilder',['SVFIRBuilder',['../classSVF_1_1SVFIRBuilder.html#a8c25c3903cda26312f182014f29069fc',1,'SVF::SVFIRBuilder']]],
   ['svfloop',['SVFLoop',['../classSVF_1_1SVFLoop.html#a25b9a079f48aa0374c91be6a1e9697f8',1,'SVF::SVFLoop']]],

package/SVF-doxygen/html/html/search/functions_6.js

@@ -253,8 +253,7 @@ var searchData=
   ['getfieldtypes',['getFieldTypes',['../classSVF_1_1DCHGraph.html#ae9a0007299178912e2568dc7158d6824',1,'SVF::DCHGraph']]],
   ['getfieldvalnodenum',['getFieldValNodeNum',['../classSVF_1_1SVFIR.html#a8a24e0bf9f95fc1519d4013e0e82dec9',1,'SVF::SVFIR']]],
   ['getfilename',['getFileName',['../classSVF_1_1PAGBuilderFromFile.html#aaaa1e516e5eeceece371a9178142c3ff',1,'SVF::PAGBuilderFromFile']]],
-  ['getfilledprod',['getFilledProd',['../classSVF_1_1CFGNormalizer.html#ab5c5efbb72cf018885e026be65c92fdf',1,'SVF::CFGNormalizer']]],
-  ['getfilledproductions',['getFilledProductions',['../classSVF_1_1CFGNormalizer.html#ae5932d3d9330e28e5fa89402a5f5ff33',1,'SVF::CFGNormalizer']]],
+  ['getfilledproductions',['getFilledProductions',['../classSVF_1_1CFGNormalizer.html#add319949e856049d3e898848a02a75b7',1,'SVF::CFGNormalizer']]],
   ['getfiobjvar',['getFIObjVar',['../classSVF_1_1ConstraintGraph.html#a7c8a29ad1d270fca745f233bb4800731',1,'SVF::ConstraintGraph::getFIObjVar()'],['../classSVF_1_1PointerAnalysis.html#a68b05bc02c5473c1e0d39ac4f4454bac',1,'SVF::PointerAnalysis::getFIObjVar()'],['../classSVF_1_1SVFIR.html#a2878e202045b7f2c817185e8bf95d354',1,'SVF::SVFIR::getFIObjVar(const MemObj *obj) const'],['../classSVF_1_1SVFIR.html#ac9f860028c8cbd364720888084701628',1,'SVF::SVFIR::getFIObjVar(NodeID id) const']]],
   ['getfirstrhs2prods',['getFirstRHS2Prods',['../classSVF_1_1CFLGrammar.html#ac0f09c94e9c6efc00398ed7d5ca1fe0f',1,'SVF::CFLGrammar']]],
   ['getfirstrhssymbol',['getFirstRHSSymbol',['../classSVF_1_1CFLGrammar.html#a837d2db607e1c9403db4d3021f4e52d4',1,'SVF::CFLGrammar']]],

package/SVF-doxygen/html/html/search/variables_13.js

@@ -25,7 +25,7 @@ var searchData=
   ['timeofbuildingsymboltable',['timeOfBuildingSymbolTable',['../classSVF_1_1SVFStat.html#ae89293bc063bdc74a988e9c37c70321e',1,'SVF::SVFStat']]],
   ['timeofcollapse',['timeOfCollapse',['../classSVF_1_1CFLAlias.html#a1615a97f72dfa8f979c429b3d4f3463b',1,'SVF::CFLAlias::timeOfCollapse()'],['../classSVF_1_1AndersenBase.html#ad40b196c2c699bd115529b806d20de25',1,'SVF::AndersenBase::timeOfCollapse()']]],
   ['timeofcreatemuchi',['TimeOfCreateMUCHI',['../classSVF_1_1MemSSAStat.html#a48c70f0ed1c7d031a3cd528035162e52',1,'SVF::MemSSAStat::TimeOfCreateMUCHI()'],['../classSVF_1_1MemSSA.html#a4d2418b7df74f23d8fd328f66e29f198',1,'SVF::MemSSA::timeOfCreateMUCHI()']]],
-  ['timeofgeneratingmemregions',['timeOfGeneratingMemRegions',['../classSVF_1_1MemSSA.html#a37dca8a7d155de4870358146d219b5e5',1,'SVF::MemSSA::timeOfGeneratingMemRegions()'],['../classSVF_1_1MemSSAStat.html#a74c36654b7452aa94aa241881f0a83c5',1,'SVF::MemSSAStat::TimeOfGeneratingMemRegions()']]],
+  ['timeofgeneratingmemregions',['TimeOfGeneratingMemRegions',['../classSVF_1_1MemSSAStat.html#a74c36654b7452aa94aa241881f0a83c5',1,'SVF::MemSSAStat::TimeOfGeneratingMemRegions()'],['../classSVF_1_1MemSSA.html#a37dca8a7d155de4870358146d219b5e5',1,'SVF::MemSSA::timeOfGeneratingMemRegions()']]],
   ['timeofinsertingphi',['TimeOfInsertingPHI',['../classSVF_1_1MemSSAStat.html#a0c24822c8549af6a96e82312954fab9b',1,'SVF::MemSSAStat::TimeOfInsertingPHI()'],['../classSVF_1_1MemSSA.html#a3c7b5fa73fdc7c805ee3673fbe812b44',1,'SVF::MemSSA::timeOfInsertingPHI()']]],
   ['timeofprocesscopygep',['timeOfProcessCopyGep',['../classSVF_1_1CFLAlias.html#a2339baef879400c3abceaa6cd710438f',1,'SVF::CFLAlias::timeOfProcessCopyGep()'],['../classSVF_1_1AndersenBase.html#aae14de6fbca9280d8d0290326aa493f0',1,'SVF::AndersenBase::timeOfProcessCopyGep()']]],
   ['timeofprocessloadstore',['timeOfProcessLoadStore',['../classSVF_1_1CFLAlias.html#ab8a98cf58afbc7fd00bd42b312073012',1,'SVF::CFLAlias::timeOfProcessLoadStore()'],['../classSVF_1_1AndersenBase.html#a9fe738f1e11c80006d540f246a80bfdf',1,'SVF::AndersenBase::timeOfProcessLoadStore()']]],

package/SVF-doxygen/html/html/search/variables_5.js

@@ -21,7 +21,7 @@ var searchData=
   ['entry',['entry',['../classSVF_1_1CallPE.html#a88e420e259b8d7d34c9850ddde53d372',1,'SVF::CallPE']]],
   ['entryfuncset',['entryFuncSet',['../classSVF_1_1TCT.html#a140eaf9440ae9d52dbfb659967aa449a',1,'SVF::TCT']]],
   ['entryicfgedges',['entryICFGEdges',['../classSVF_1_1SVFLoop.html#a681d712db88d105c8a2f758de3d7e72e',1,'SVF::SVFLoop']]],
-  ['epsilon',['epsilon',['../CFLGrammar_8txt.html#a114c2e5cd44b3ea4720e9191ed819f3b',1,'CFLGrammar.txt']]],
+  ['epsilon',['epsilon',['../CFLGrammar_8txt.html#a114c2e5cd44b3ea4720e9191ed819f3b',1,'epsilon(): CFLGrammar.txt'],['../VFG_8txt.html#ad62a43ea41bf293d8609998d1c808c1f',1,'epsilon(): VFG.txt']]],
   ['epsilonprods',['epsilonProds',['../classSVF_1_1CFLGrammar.html#a4d9770a2b935bcad74ae551389925f74',1,'SVF::CFLGrammar']]],
   ['equivalentobject',['equivalentObject',['../classSVF_1_1VersionedFlowSensitive.html#a2d451d89f99a4bff828b682723df477f',1,'SVF::VersionedFlowSensitive']]],
   ['evaltime',['EvalTime',['../classSVF_1_1NodeIDAllocator_1_1Clusterer.html#a1d98862e19affdd08740f85490d0d856',1,'SVF::NodeIDAllocator::Clusterer']]],

package/build.sh

@@ -85,7 +85,7 @@ function build_z3_from_source {
     mkdir "$Z3Home"
     echo "Downloading Z3 source..."
     generic_download_file "$SourceZ3" z3.zip
-    check_zip
+    check_unzip
     echo "Unzipping Z3 source..."
     mkdir z3-source
     unzip z3.zip -d z3-source

package/include/CFL/CFGNormalizer.h

@@ -72,11 +72,11 @@ private:
 
     GrammarBase::Symbol check_head(GrammarBase::SymbolMap<GrammarBase::Symbol, GrammarBase::Productions>& grammar, GrammarBase::Production& rule);
 
-    GrammarBase::Production strTrans(std::string strPro, CFLGrammar *grammar);
+    void strTrans(std::string strPro, CFLGrammar *grammar, GrammarBase::Production& normalProd);
 
-    GrammarBase::Production getFilledProd(GrammarBase::Production &prod, CFLGrammar::Attribute attribute, CFLGrammar *grammar);
+    void getFilledProductions(GrammarBase::Production &prod,const NodeSet& nodeSet, CFLGrammar *grammar, GrammarBase::Productions& normalProds);
 
-    GrammarBase::Productions getFilledProductions(GrammarBase::Production &prod,const Map<CFLGrammar::Kind, Set<CFLGrammar::Attribute>>& kind2AttriMap, CFLGrammar *grammar);
+    void removeFirstSymbol(CFLGrammar *grammar);
 };
 
 } // End namespace SVF

package/include/CFL/VFG.txt

@@ -3,4 +3,5 @@ Start:
 Terminal:
    a Call Ret
 Productions:
-   A -> A A | a | Call_i A Ret_i | epsilon;
+   A -> A A | a | Call_i A Ret_i | epsilon;
+   Abar -> Abar Abar | abar | Retbar_i Abar Callbar_i | epsilon; 

package/lib/CFL/CFGNormalizer.cpp

@@ -60,6 +60,14 @@ CFLGrammar* CFGNormalizer::normalize(GrammarBase *generalGrammar)
 
 CFLGrammar* CFGNormalizer::fillAttribute(CFLGrammar *grammar, const Map<CFLGrammar::Kind, Set<CFLGrammar::Attribute>>& kind2AttrsMap)
 {
+    NodeSet nodeSet = {};
+    for (auto pair: kind2AttrsMap)
+    {
+        for (auto attri: pair.second)
+        {
+            nodeSet.insert(attri);
+        }
+    }
     for(auto symProdsPair: grammar->getRawProductions())
     {
         for(auto prod: symProdsPair.second)
@@ -68,8 +76,9 @@ CFLGrammar* CFGNormalizer::fillAttribute(CFLGrammar *grammar, const Map<CFLGramm
             /// so append to the begin of the production
             GrammarBase::Production tempP = prod;
             tempP.insert(tempP.begin(), symProdsPair.first);
-            GrammarBase::Productions filledProductions =  getFilledProductions(tempP, kind2AttrsMap, grammar);
-            for (auto  filledProd : filledProductions)
+            GrammarBase::Productions normalProds;
+            getFilledProductions(tempP, nodeSet, grammar, normalProds);
+            for (auto  filledProd : normalProds)
             {
                 insertToCFLGrammar(grammar, filledProd);
             }
@@ -83,19 +92,7 @@ void CFGNormalizer::ebnf_bin(CFLGrammar *grammar)
 {
     GrammarBase::SymbolMap<GrammarBase::Symbol, GrammarBase::Productions> new_grammar = {};
     std::string tempStr = "";
-
-    for(auto head : grammar->getRawProductions())
-    {
-        for(auto rule: head.second)
-        {
-
-            GrammarBase::Production long_run = rule;
-            long_run.erase(long_run.begin());
-            auto it = grammar->getRawProductions().at(head.first).find(rule);
-            grammar->getRawProductions().at(head.first).erase(it);
-            grammar->getRawProductions()[head.first].insert(long_run);
-        }
-    }
+    removeFirstSymbol(grammar);
 
     auto rawProductions = grammar->getRawProductions();
 
@@ -220,26 +217,13 @@ void CFGNormalizer::ebnf_bin(CFLGrammar *grammar)
     }
 }
 
-GrammarBase::Production CFGNormalizer::getFilledProd(GrammarBase::Production &prod, CFLGrammar::Attribute attribute, CFLGrammar *grammar)
-{
-    GrammarBase::Production tempP = prod;
-    for (int i = 0; i < int(prod.size()); i++)
-    {
-        if (grammar->getAttrSyms().find(prod[i].kind) != grammar->getAttrSyms().end())
-        {
-            tempP[i] = prod[i].kind;
-        }
-    }
-    return tempP;
-}
-
 ///Loop through provided production based on existence of attribute of attribute variable
 ///and expand to productions set
 ///e.g Xi -> Y Zi with Xi i = 0, 1, Yi i = 0,2
 ///Will get {X0 -> Y Z0, X1 -> Y Z1, X2 -> Y Z2}
-GrammarBase::Productions CFGNormalizer::getFilledProductions(GrammarBase::Production &prod, const Map<CFLGrammar::Kind,  Set<CFLGrammar::Attribute>>& kind2AttriMap, CFLGrammar *grammar)
+void CFGNormalizer::getFilledProductions(GrammarBase::Production &prod, const NodeSet& nodeSet, CFLGrammar *grammar,  GrammarBase::Productions& normalProds)
 {
-    GrammarBase::Productions filledProductioins{};
+    normalProds.clear();
     CFLFIFOWorkList<GrammarBase::Production> worklist;
     worklist.push(prod);
     while( worklist.empty() == false )
@@ -258,10 +242,10 @@ GrammarBase::Productions CFGNormalizer::getFilledProductions(GrammarBase::Produc
         }
         if ( currentVariableAttribute == 0)
         {
-            filledProductioins.insert(currentProduction);
+            normalProds.insert(currentProduction);
             continue;
         }
-        auto nodeSet = {0, 1, 2, 3, 4, 5, 6, 7, 20};                 //*(kind2AttriMap.find(baseKind));
+        //*(kind2AttriMap.find(baseKind));
         //for (auto attribute : nodeSet.second)
         for (auto attribute : nodeSet)
         {
@@ -285,7 +269,7 @@ GrammarBase::Productions CFGNormalizer::getFilledProductions(GrammarBase::Produc
             }
             if ( continueToFill == false)
             {
-                filledProductioins.insert(fillingProduction);
+                normalProds.insert(fillingProduction);
             }
             else
             {
@@ -293,7 +277,6 @@ GrammarBase::Productions CFGNormalizer::getFilledProductions(GrammarBase::Produc
             }
         }
     }
-    return filledProductioins;
 }
 
 int CFGNormalizer::ebnfBracketMatch(GrammarBase::Production &prod, int i, CFLGrammar *grammar)
@@ -422,11 +405,12 @@ void CFGNormalizer::ebnfSignReplace(char sign, CFLGrammar *grammar)
         if (sign == '*' || sign == '?')
         {
             /// Insert Back the Group
-            GrammarBase::Production E = strTrans(rep.first, grammar);
+            GrammarBase::Production normalProd;
+            strTrans(rep.first, grammar, normalProd);
             GrammarBase::Production withoutSign = {};
             if (sign == '*')
             {
-                for (auto &word : E)
+                for (auto &word : normalProd)
                 {
                     if (word != grammar->str2Symbol("*")  && word != grammar->str2Symbol("(") && word != grammar->str2Symbol(")"))
                     {
@@ -437,7 +421,7 @@ void CFGNormalizer::ebnfSignReplace(char sign, CFLGrammar *grammar)
             }
             if (sign == '?')
             {
-                for (auto &word : E)
+                for (auto &word : normalProd)
                 {
                     if (word != grammar->str2Symbol("?")  && word != grammar->str2Symbol("(") && word != grammar->str2Symbol(")"))
                     {
@@ -451,9 +435,8 @@ void CFGNormalizer::ebnfSignReplace(char sign, CFLGrammar *grammar)
     }
 }
 
-GrammarBase::Production CFGNormalizer::strTrans(std::string LHS, CFLGrammar *grammar)
+void CFGNormalizer::strTrans(std::string LHS, CFLGrammar *grammar, GrammarBase::Production& normalProd)
 {
-    GrammarBase::Production  prod = {};
     std::smatch matches;
     std::regex LHSReg("\\s*(.*)");
     std::string delimiter;
@@ -466,10 +449,9 @@ GrammarBase::Production CFGNormalizer::strTrans(std::string LHS, CFLGrammar *gra
     {
         word = LHS.substr(0, pos);
         LHS.erase(0, pos + delimiter.length());
-        prod.push_back(grammar->str2Symbol(word));
+        normalProd.push_back(grammar->str2Symbol(word));
     }
-    prod.push_back(grammar->str2Symbol(LHS));
-    return prod;
+    normalProd.push_back(grammar->str2Symbol(LHS));
 }
 
 GrammarBase::Symbol CFGNormalizer::check_head(GrammarBase::SymbolMap<GrammarBase::Symbol, GrammarBase::Productions> &grammar, GrammarBase::Production &rule)
@@ -511,3 +493,20 @@ void CFGNormalizer::insertToCFLGrammar(CFLGrammar *grammar, GrammarBase::Product
         grammar->getSecondRHS2Prods()[prod[2]].insert(prod);
     }
 }
+
+void CFGNormalizer::removeFirstSymbol(CFLGrammar *grammar)
+{
+    // Remove First Terminal
+    for(auto head : grammar->getRawProductions())
+    {
+        for(auto rule: head.second)
+        {
+
+            GrammarBase::Production long_run = rule;
+            long_run.erase(long_run.begin());
+            auto it = grammar->getRawProductions().at(head.first).find(rule);
+            grammar->getRawProductions().at(head.first).erase(it);
+            grammar->getRawProductions()[head.first].insert(long_run);
+        }
+    }
+}

package/lib/CFL/CFLGraphBuilder.cpp

@@ -433,35 +433,80 @@ CFLGraph* VFCFLGraphBuilder::buildBigraph(SVFG *graph, Kind startKind, GrammarBa
         CFLNode* node = new CFLNode((*it).first);
         cflGraph->addCFLNode((*it).first, node);
     }
-    // for(auto it = graph->begin(); it!= graph->end(); it++)
-    // {
-    //     ConstraintNode* node = (*it).second;
-    //     for(ConstraintEdge* edge : node->getOutEdges())
-    //     {
-    //         CFLGrammar::Kind edgeLabel = edge->getEdgeKind();
-    //         // Need to get the offset from the Const Edge
-    //         // The offset present edge is only from Normal Gep CG at moment
-    //         if(NormalGepCGEdge::classof(edge))
-    //         {
-    //             NormalGepCGEdge *nGepEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge);
-    //             CFLGrammar::Attribute attr =  nGepEdge->getConstantFieldIdx();
-    //             addAttribute(edgeLabel, attr);
-    //             edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
-    //             cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
-    //             std::string key = kind2LabelMap[edge->getEdgeKind()];
-    //             key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
-    //             cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
-    //             addAttribute(label2KindMap[key], attr);
-    //         }
-    //         else
-    //         {
-    //             cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
-    //             std::string key = kind2LabelMap[edge->getEdgeKind()];
-    //             key.append("bar");
-    //             cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), label2KindMap[key]);
-    //         }
-    //     }
-    // }
+    for(auto it = graph->begin(); it!= graph->end(); it++)
+    {
+        VFGNode* node = (*it).second;
+        for(VFGEdge* edge : node->getOutEdges())
+        {
+            CFLGrammar::Kind edgeLabel;
+            // Get 'a' edge : IntraDirectVF || IntraIndirectVF
+            if (edge->getEdgeKind() == VFGEdge::IntraDirectVF || edge->getEdgeKind() == VFGEdge::IntraIndirectVF || edge->getEdgeKind() == VFGEdge::TheadMHPIndirectVF )
+            {
+                edgeLabel = 0;
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                std::string key = kind2LabelMap[edge->getEdgeKind()];
+                key.append("bar");
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), label2KindMap[key]);
+            }
+            // Get 'call' edge : CallDirVF || CallIndVF
+            else if ( edge->getEdgeKind() == VFGEdge::CallDirVF )
+            {
+                edgeLabel = 1;
+                CallDirSVFGEdge *attributedEdge = SVFUtil::dyn_cast<CallDirSVFGEdge>(edge);
+                CFLGrammar::Attribute attr =  attributedEdge->getCallSiteId();
+                addAttribute(edgeLabel, attr);
+                edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                std::string key = kind2LabelMap[edge->getEdgeKind()];
+                key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
+                addAttribute(label2KindMap[key], attr);
+            }
+            // Get 'call' edge : CallIndVF
+            else if ( edge->getEdgeKind() == VFGEdge::CallIndVF )
+            {
+                edgeLabel = 1;
+                CallIndSVFGEdge *attributedEdge = SVFUtil::dyn_cast<CallIndSVFGEdge>(edge);
+                CFLGrammar::Attribute attr =  attributedEdge->getCallSiteId();
+                addAttribute(edgeLabel, attr);
+                edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                std::string key = kind2LabelMap[edge->getEdgeKind()];
+                key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
+                addAttribute(label2KindMap[key], attr);
+            }
+            // Get 'ret' edge : RetDirVF
+            else if ( edge->getEdgeKind() == VFGEdge::RetDirVF )
+            {
+                edgeLabel = 2;
+                RetDirSVFGEdge *attributedEdge = SVFUtil::dyn_cast<RetDirSVFGEdge>(edge);
+                CFLGrammar::Attribute attr =  attributedEdge->getCallSiteId();
+                addAttribute(edgeLabel, attr);
+                edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                std::string key = kind2LabelMap[edge->getEdgeKind()];
+                key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
+                addAttribute(label2KindMap[key], attr);
+            }
+            // Get 'ret' edge : RetIndVF
+            else if ( edge->getEdgeKind() == VFGEdge::RetIndVF )
+            {
+                edgeLabel = 2;
+                RetIndSVFGEdge *attributedEdge = SVFUtil::dyn_cast<RetIndSVFGEdge>(edge);
+                CFLGrammar::Attribute attr =  attributedEdge->getCallSiteId();
+                addAttribute(edgeLabel, attr);
+                edgeLabel = CFLGrammar::getAttributedKind(attr, edgeLabel);
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getSrcID()), cflGraph->getGNode(edge->getDstID()), edgeLabel);
+                std::string key = kind2LabelMap[edge->getEdgeKind()];
+                key.append("bar");   // for example Gep_i should be Gepbar_i, not Gep_ibar
+                cflGraph->addCFLEdge(cflGraph->getGNode(edge->getDstID()), cflGraph->getGNode(edge->getSrcID()), CFLGrammar::getAttributedKind(attr, label2KindMap[key]));
+                addAttribute(label2KindMap[key], attr);
+            }
+        }
+    }
     return cflGraph;
 }
 

package/lib/CFL/CFLVF.cpp

@@ -48,7 +48,7 @@ void CFLVF::analyze()
         PointerAnalysis::initialize();
         GrammarBase *grammarBase = grammarBuilder.build();
         AndersenWaveDiff* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-        svfg =  memSSA.buildPTROnlySVFG(ander);
+        svfg =  memSSA.buildFullSVFG(ander);
         ConstraintGraph *consCG = new ConstraintGraph(svfir);
         if (Options::PEGTransfer)
         {

package/package.json

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