svf-tools 1.0.757 → 1.0.759

package/svf/include/Util/WorkList.h

@@ -221,7 +221,7 @@ private:
 };
 
 /**
- * Worlist with "first in last out" order.
+ * Worklist with "first in last out" order.
  * New nodes will be pushed at back and popped from back.
  * Elements in the list are unique as they're recorded by Set.
  */

package/svf/include/Util/cJSON.h

@@ -111,7 +111,7 @@ typedef struct cJSON
     /* The type of the item, as above. */
     int type;
 
-    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    /* The item's string, if type==cJSON_String and type == cJSON_Raw */
     char *valuestring;
     /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
     int valueint;

package/svf/include/WPA/Andersen.h

@@ -327,7 +327,7 @@ protected:
     void mergeSccNodes(NodeID repNodeId, const NodeBS& subNodes);
     void mergeSccCycle();
     //@}
-    /// Collapse a field object into its base for field insensitive anlaysis
+    /// Collapse a field object into its base for field insensitive analysis
     //@{
     virtual void collapsePWCNode(NodeID nodeId);
     void collapseFields();

package/svf/include/WPA/FlowSensitive.h

@@ -75,7 +75,7 @@ public:
     /// Destructor
     ~FlowSensitive() override = default;
 
-    /// Create signle instance of flow-sensitive pointer analysis
+    /// Create single instance of flow-sensitive pointer analysis
     static FlowSensitive* createFSWPA(SVFIR* _pag)
     {
         if (fspta == nullptr)

package/svf/include/WPA/WPASolver.h

@@ -196,7 +196,7 @@ protected:
     WorkList worklist;
 
 public:
-    /// num of iterations during constaint solving
+    /// num of iterations during constraint solving
     u32_t numOfIteration;
 };
 

package/svf/lib/AbstractExecution/SVFIR2ConsExeState.cpp

@@ -688,7 +688,7 @@ void SVFIR2ConsExeState::initValVar(const ValVar *valVar, u32_t varId)
 
     if (const SVFType *type = valVar->getType())
     {
-        // TODO:miss floatpointerty, voidty, labelty, matadataty
+        // TODO:miss floatpointerty, voidty, labelty, metadataty
         if (type->getKind() == SVFType::SVFIntegerTy ||
                 type->getKind() == SVFType::SVFPointerTy ||
                 type->getKind() == SVFType::SVFFunctionTy ||

package/svf/lib/CFL/CFGNormalizer.cpp

@@ -341,13 +341,13 @@ void CFGNormalizer::ebnfSignReplace(char sign, CFGrammar *grammar)
                 s32_t signGroupStart = -1;
                 if (grammar->kindToStr(ebnfProduction[i].kind) == std::string(1, sign))
                 {
-                    /// If sign assoicate wihout group e.i with single symble
+                    /// If sign associate without group e.i with single symbol
                     assert(i != 1 && "sign in grammar associate with no symbol");
                     if (grammar->kindToStr(ebnfProduction[i - 1].kind) != std::string(1, ')'))
                     {
                         signGroupStart = i - 1;
                     }
-                    /// sign associate with group of symble by brace pair
+                    /// sign associate with group of symbol by brace pair
                     else
                     {
                         signGroupStart = ebnfBracketMatch(ebnfProduction, i, grammar);

package/svf/lib/CFL/CFLAlias.cpp

@@ -203,7 +203,7 @@ void CFLAlias::initialize()
     // Normalize CFL Grammar
     normalizeCFLGrammar();
 
-    // Initialize sovler
+    // Initialize solver
     initializeSolver();
 }
 
@@ -240,7 +240,7 @@ void CFLAlias::solve()
             numOfIteration++;
             solver->solve();
         }
-    } // Only cflgraph built from bc could reanlyze by update call graph
+    } // Only cflgraph built from bc could reanalyze by update call graph
 
     double end = stat->getClk(true);
     timeOfSolving += (end - start) / TIMEINTERVAL;

package/svf/lib/CFL/CFLGraphBuilder.cpp

@@ -377,8 +377,8 @@ CFLGraph* AliasCFLGraphBuilder::buildBiPEGgraph(ConstraintGraph *graph, Kind sta
             {
                 /// Handle VGep normalize to Normal Gep by connecting all geps' srcs to vgep dest
                 /// Example: In Test Case: Ctest field-ptr-arith-varIdx.c.bc
-                /// BFS Search the 8 LEVEL up to find the ValueNode, and the number of level search is arbitary
-                /// the more the level search the more valueNode and the Vgep Dst will possivble connect
+                /// BFS Search the 8 LEVEL up to find the ValueNode, and the number of level search is arbitrary
+                /// the more the level search the more valueNode and the Vgep Dst will possibly connect
                 connectVGep(cflGraph, graph,  edge->getSrcNode(), edge->getDstNode(), 8, pag);
             }
             else

package/svf/lib/CFL/CFLVF.cpp

@@ -67,7 +67,7 @@ void CFLVF::initialize()
     // Normalize grammar
     normalizeCFLGrammar();
 
-    // Initialize sovler
+    // Initialize solver
     solver = new CFLSolver(graph, grammar);
 }
 

package/svf/lib/DDA/ContextDDA.cpp

@@ -344,7 +344,7 @@ bool ContextDDA::isHeapCondMemObj(const CxtVar& var, const StoreSVFGNode*)
             if (gepobj != nullptr)
             {
                 assert(SVFUtil::isa<DummyObjVar>(_pag->getGNode(gepobj->getBaseNode()))
-                       && "emtpy refVal in a gep object whose base is a non-dummy object");
+                       && "empty refVal in a gep object whose base is a non-dummy object");
             }
             else
             {

package/svf/lib/FastCluster/fastcluster.cpp

@@ -1,5 +1,5 @@
 //
-// C++ standalone verion of fastcluster by Daniel Müllner
+// C++ standalone version of fastcluster by Daniel Müllner
 //
 // Copyright: Christoph Dalitz, 2020
 //            Daniel Müllner, 2011
@@ -145,7 +145,7 @@ void cutree_cdist(int n, const int* merge, double* height, double cdist, int* la
 // Output arguments:
 //   merge   = allocated (n-1)x2 matrix (2*(n-1) array) for storing result.
 //             Result follows R hclust convention:
-//              - observabe indices start with one
+//              - observable indices start with one
 //              - merge[i][] contains the merged nodes in step i
 //              - merge[i][j] is negative when the node is an atom
 //   height  = allocated (n-1) array with distances at each merge step
@@ -156,7 +156,7 @@ void cutree_cdist(int n, const int* merge, double* height, double cdist, int* la
 int hclust_fast(int n, double* distmat, int method, int* merge, double* height)
 {
 
-    // call appropriate culstering function
+    // call appropriate clustering function
     cluster_result Z2(n-1);
     if (method == HCLUST_METHOD_SINGLE)
     {

package/svf/lib/Graphs/ConsG.cpp

@@ -298,7 +298,7 @@ StoreCGEdge* ConstraintGraph::addStoreCGEdge(NodeID src, NodeID dst)
  *
  * (1) Remove edge from old dst target,
  * (2) Change edge dst id and
- * (3) Add modifed edge into new dst
+ * (3) Add modified edge into new dst
  */
 void ConstraintGraph::reTargetDstOfEdge(ConstraintEdge* edge, ConstraintNode* newDstNode)
 {

package/svf/lib/Graphs/SVFGOPT.cpp

@@ -340,7 +340,7 @@ bool SVFGOPT::canBeRemoved(const SVFGNode * node)
              FormalOUTSVFGNode, MSSAPHISVFGNode>(node))
     {
         /// Now each SVFG edge can only be associated with one call site id,
-        /// so if this node has both incoming call/ret and outgoting call/ret
+        /// so if this node has both incoming call/ret and outgoing call/ret
         /// edges, we don't remove this node.
         if (isConnectingTwoCallSites(node))
             return false;
@@ -438,7 +438,7 @@ void SVFGOPT::handleIntraValueFlow()
 /// 1. keepAllSelfCycle = TRUE: all self cycle edges are kept;
 /// 2. keepContextSelfCycle = TRUE: all self cycle edges related-to context are kept;
 /// 3. Otherwise, all self cycle edges are NOT kept.
-/// Return TRUE if some self cycle edges remaine in this node.
+/// Return TRUE if some self cycle edges remain in this node.
 bool SVFGOPT::checkSelfCycleEdges(const MSSAPHISVFGNode* node)
 {
     bool hasSelfCycle = false;

package/svf/lib/Graphs/VFG.cpp

@@ -463,7 +463,7 @@ void VFG::destroy()
 void VFG::addVFGNodes()
 {
 
-    // initialize dummy definition  null pointers in order to uniform the construction
+    // initialize dummy definition null pointers in order to uniform the construction
     // to be noted for black hole pointer it has already has address edge connected,
     // and its definition will be set when processing addr SVFIR edge.
     addNullPtrVFGNode(pag->getGNode(pag->getNullPtr()));
@@ -658,7 +658,7 @@ void VFG::addVFGNodes()
         if(isInterestedPAGNode(edge->getBranchInst()))
             addBranchVFGNode(edge);
     }
-    // initialize llvm cmp nodes (comparision)
+    // initialize llvm cmp nodes (comparison)
     SVFStmt::SVFStmtSetTy& cmps = getPAGEdgeSet(SVFStmt::Cmp);
     for (SVFStmt::SVFStmtSetTy::iterator iter = cmps.begin(), eiter =
                 cmps.end(); iter != eiter; ++iter)

package/svf/lib/MSSA/MemRegion.cpp

@@ -520,7 +520,7 @@ void MRGenerator::collectCallSitePts(const CallICFGNode* cs)
 
 
 /*!
- * Recurisively collect all points-to of the whole struct fields
+ * Recursively collect all points-to of the whole struct fields
  */
 NodeBS& MRGenerator::CollectPtsChain(NodeID id)
 {

package/svf/lib/MTA/FSMPTA.cpp

@@ -499,7 +499,7 @@ void MTASVFGBuilder::handleStoreLoad(const StmtSVFGNode* n1,const StmtSVFGNode*
     /// Lock
     /// todo: we only consider all cxtstmt of one instruction in one lock span,
     /// otherwise we think this instruction is not locked
-    /// This constrait is too strong. All cxt lock under different cxt cannot be identified.
+    /// This constraint is too strong. All cxt lock under different cxt cannot be identified.
 
 
     if (ADDEDGE_NOLOCK!=Options::AddModelFlag() && lockana->isProtectedByCommonLock(i1, i2))

package/svf/lib/MTA/LockAnalysis.cpp

@@ -676,7 +676,7 @@ bool LockAnalysis::isInSameCSSpan(const CxtStmt& cxtStmt1, const CxtStmt& cxtStm
     return intersects(lockset1,lockset2);
 }
 /*!
- * Return true if two instructions are inside at least one common contex-sensitive lock span
+ * Return true if two instructions are inside at least one common context-sensitive lock span
  */
 bool LockAnalysis::isInSameCSSpan(const SVFInstruction *I1, const SVFInstruction *I2) const
 {

package/svf/lib/MTA/MHP.cpp

@@ -400,7 +400,7 @@ void MHP::updateAncestorThreads(NodeID curTid)
  * Exclude sibling thread that never happen in parallel based on ForkJoinAnalysis
  *
  * The interleaving of a thread t is not unnecessary to be updated if
- * (1) t HB Sibling and t fully joins curTid recusively
+ * (1) t HB Sibling and t fully joins curTid recursively
  * or
  * (2) Sibling HB t
  */

package/svf/lib/MemoryModel/AccessPath.cpp

@@ -57,7 +57,7 @@ bool AccessPath::isConstantOffset() const
 }
 
 /// Return element number of a type
-/// (1) StructType or Array, return flatterned number elements.
+/// (1) StructType or Array, return flattened number elements.
 /// (2) PointerType, return the element number of the pointee
 /// (3) non-pointer SingleValueType, return 1
 u32_t AccessPath::getElementNum(const SVFType* type) const
@@ -69,7 +69,7 @@ u32_t AccessPath::getElementNum(const SVFType* type) const
     }
     else if (type->isSingleValueType())
     {
-        /// This is a pointer arithmic
+        /// This is a pointer arithmetic
         if(const SVFPointerType* pty = SVFUtil::dyn_cast<SVFPointerType>(type))
             return getElementNum(pty->getPtrElementType());
         else

package/svf/lib/SABER/ProgSlice.cpp

@@ -165,7 +165,7 @@ void ProgSlice::evalFinalCond2Event(GenericBug::EventStack &eventStack) const
  * Evaluate Atoms of a condition
  * TODO: for now we only evaluate one path, evaluate every single path
  *
- * Atom -- a propositional valirable: a, b, c
+ * Atom -- a propositional variable: a, b, c
  * Literal -- an atom or its negation: a, ~a
  * Clause  -- A disjunction of some literals: a \vee b
  * CNF formula -- a conjunction of some clauses:  (a \vee b ) \wedge (c \vee d)

package/svf/lib/SABER/SaberCondAllocator.cpp

@@ -466,7 +466,7 @@ SaberCondAllocator::getPHIComplementCond(const SVFBasicBlock* BB1, const SVFBasi
 {
     assert(BB1 && BB2 && "expect nullptr BB here!");
 
-    /// avoid both BB0 and BB1 dominate BB2 (e.g., while loop), then BB2 is not necessaryly a complement BB
+    /// avoid both BB0 and BB1 dominate BB2 (e.g., while loop), then BB2 is not necessarily a complement BB
     if (dominate(BB1, BB2) && ! dominate(BB0, BB2))
     {
         Condition cond = ComputeIntraVFGGuard(BB1, BB2);

package/svf/lib/SVFIR/SVFFileSystem.cpp

@@ -54,7 +54,7 @@ static SVFValue* createSVFValue(SVFValue::GNodeK kind, const SVFType* type,
         case SVFValue::SVFVal:
             ABORT_MSG("Creation of RAW SVFValue isn't allowed");
         case SVFValue::SVFFunc:
-            return new SVFFunction(type, {}, {}, {}, {}, {}, {});
+            return new SVFFunction(type, {}, {}, {}, {}, {}, {}, {});
         case SVFValue::SVFBB:
             return new SVFBasicBlock(type, {});
         case SVFValue::SVFInst:
@@ -553,6 +553,7 @@ cJSON* SVFIRWriter::contentToJson(const SVFFunction* value)
     F(realDefFun);
     F(allBBs);
     F(allArgs);
+    F(annotations);
 #undef F
     return root;
 }
@@ -2368,6 +2369,7 @@ void SVFIRReader::fill(const cJSON*& fieldJson, SVFFunction* value)
     F(realDefFun);
     F(allBBs);
     F(allArgs);
+    F(annotations);
 #undef F
 }
 

package/svf/lib/SVFIR/SVFIR.cpp

@@ -381,7 +381,7 @@ GepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst, const AccessPath& ap)
 
 /*!
  * Add a temp field value node, this method can only invoked by getGepValVar
- * due to constaint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
+ * due to constraint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
  */
 NodeID SVFIR::addGepValNode(const SVFValue* curInst,const SVFValue* gepVal, const AccessPath& ap, NodeID i, const SVFType* type)
 {
@@ -533,7 +533,7 @@ NodeID SVFIR::getBaseValVar(NodeID nodeId)
 }
 
 /*!
- * It is used to create a dummy GepValVar during global initiailzation.
+ * It is used to create a dummy GepValVar during global initialization.
  */
 NodeID SVFIR::getGepValVar(const SVFValue* curInst, NodeID base, const AccessPath& ap) const
 {
@@ -693,7 +693,7 @@ bool SVFIR::isNonPointerObj(NodeID id) const
     }
 }
 /*
- * If this is a dummy node or node does not have incoming edges and outcoming edges we assume it is not a pointer here.
+ * If this is a dummy node or node does not have incoming edges and outgoing edges we assume it is not a pointer here.
  * However, if it is a pointer and it is an argument of a function definition, we assume it is a pointer here.
  */
 bool SVFIR::isValidPointer(NodeID nodeId) const

package/svf/lib/SVFIR/SVFValue.cpp

@@ -26,7 +26,7 @@ const SVFType* StInfo::getOriginalElemType(u32_t fldIdx) const
 
 const SVFLoopAndDomInfo::LoopBBs& SVFLoopAndDomInfo::getLoopInfo(const SVFBasicBlock* bb) const
 {
-    assert(hasLoopInfo(bb) && "loopinfo does not exit (bb not in a loop)");
+    assert(hasLoopInfo(bb) && "loopinfo does not exist (bb not in a loop)");
     Map<const SVFBasicBlock*, LoopBBs>::const_iterator mapIter = bb2LoopMap.find(bb);
     return mapIter->second;
 }
@@ -124,10 +124,10 @@ bool SVFLoopAndDomInfo::isLoopHeader(const SVFBasicBlock* bb) const
 
 SVFFunction::SVFFunction(const SVFType* ty, const SVFFunctionType* ft,
                          bool declare, bool intrinsic, bool adt, bool varg,
-                         SVFLoopAndDomInfo* ld)
+                         SVFLoopAndDomInfo* ld, std::vector<std::string> annos)
     : SVFValue(ty, SVFValue::SVFFunc), isDecl(declare), intrinsic(intrinsic),
       addrTaken(adt), isUncalled(false), isNotRet(false), varArg(varg),
-      funcType(ft), loopAndDom(ld), realDefFun(nullptr)
+      funcType(ft), loopAndDom(ld), realDefFun(nullptr), annotations(std::move(annos))
 {
 }
 
@@ -179,7 +179,7 @@ u32_t SVFBasicBlock::getBBSuccessorPos(const SVFBasicBlock* Succ)
             return i;
         i++;
     }
-    assert(false && "Didn't find succesor edge?");
+    assert(false && "Didn't find successor edge?");
     return 0;
 }
 
@@ -192,7 +192,7 @@ u32_t SVFBasicBlock::getBBSuccessorPos(const SVFBasicBlock* Succ) const
             return i;
         i++;
     }
-    assert(false && "Didn't find succesor edge?");
+    assert(false && "Didn't find successor edge?");
     return 0;
 }
 

package/svf/lib/SVFIR/SymbolTableInfo.cpp

@@ -168,7 +168,7 @@ const MemObj* SymbolTableInfo::createDummyObj(SymID symId, const SVFType* type)
     return memObj;
 }
 
-/// Number of flattenned elements of an array or struct
+/// Number of flattened elements of an array or struct
 u32_t SymbolTableInfo::getNumOfFlattenElements(const SVFType* T)
 {
     if(Options::ModelArrays())
@@ -177,7 +177,7 @@ u32_t SymbolTableInfo::getNumOfFlattenElements(const SVFType* T)
         return getTypeInfo(T)->getNumOfFlattenFields();
 }
 
-/// Flatterned offset information of a struct or an array including its array fields
+/// Flattened offset information of a struct or an array including its array fields
 u32_t SymbolTableInfo::getFlattenedElemIdx(const SVFType* T, u32_t origId)
 {
     if(Options::ModelArrays())