svf-lib 1.0.2201 → 1.0.2203

package/SVF-linux/Release-build/include/SVFIR/SVFIR.h

@@ -553,10 +553,10 @@ private:
         return addValNode(node);
     }
 
-    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type, bool isUncalled = false)
+    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type)
     {
         ArgValVar* node =
-            new ArgValVar(i, argNo, icfgNode, callGraphNode, type, isUncalled);
+            new ArgValVar(i, argNo, icfgNode, callGraphNode, type);
         return addValNode(node);
     }
 

package/SVF-linux/Release-build/include/SVFIR/SVFValue.h

@@ -292,6 +292,8 @@ public:
     //@}
 };
 
+class ArgValVar;
+
 class SVFFunction : public SVFValue
 {
     friend class LLVMModuleSet;
@@ -316,7 +318,7 @@ private:
     const SVFFunctionType* funcType; /// FunctionType, which is different from the type (PointerType) of this SVFFunction
     SVFLoopAndDomInfo* loopAndDom;  /// the loop and dominate information
     const SVFFunction* realDefFun;  /// the definition of a function across multiple modules
-    std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
+    std::vector<const ArgValVar*> allArgs;    /// all formal arguments of this function
     SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
     const CallGraphNode *callGraphNode;          /// call graph node for this function
     BasicBlockGraph* bbGraph; /// the basic block graph of this function
@@ -327,7 +329,7 @@ protected:
         callGraphNode = cgn;
     }
 
-    inline void addArgument(SVFArgument* arg)
+    inline void addArgument(const ArgValVar* arg)
     {
         allArgs.push_back(arg);
     }
@@ -417,7 +419,7 @@ public:
     }
 
     u32_t arg_size() const;
-    const SVFArgument* getArg(u32_t idx) const;
+    const ArgValVar* getArg(u32_t idx) const;
     bool isVarArg() const;
 
     inline bool hasBasicBlock() const

package/SVF-linux/Release-build/include/SVFIR/SVFVariables.h

@@ -368,7 +368,6 @@ class ArgValVar: public ValVar
 private:
     const CallGraphNode* cgNode;
     u32_t argNo;
-    bool uncalled;
 
 protected:
     /// Constructor to create function argument (for SVFIRReader/deserialization)
@@ -401,7 +400,7 @@ public:
 
     /// Constructor
     ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn, const CallGraphNode* callGraphNode,
-              const SVFType* svfType, bool isUncalled = false);
+              const SVFType* svfType);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -422,7 +421,7 @@ public:
 
     inline bool isArgOfUncalledFunction() const
     {
-        return uncalled;
+        return getFunction()->isUncalledFunction();
     }
 
     virtual bool isPointer() const;

package/SVF-osx/Release-build/include/Graphs/SCC.h

@@ -123,14 +123,30 @@ public:
 
 
     // Return a handle to the stack of nodes in topological
-    // order.  This will be used to seed the initial solution
+    // order. This will be used to seed the initial solution
     // and improve efficiency.
     inline GNodeStack &topoNodeStack()
     {
         return _T;
     }
 
-    const inline  GNODESCCInfoMap &GNodeSCCInfo() const
+    /// Return a handle to the stack of nodes in reverse topological
+    /// order. This will be used to seed the initial solution
+    /// and improve efficiency.
+    inline GNodeStack revTopoNodeStack()
+    {
+        GNodeStack revTopoOrder;
+        GNodeStack topoOrder = topoNodeStack();
+        while(!topoOrder.empty())
+        {
+            NodeID nodeID = topoOrder.top();
+            topoOrder.pop();
+            revTopoOrder.push(nodeID);
+        }
+        return revTopoOrder;
+    }
+
+    const inline GNODESCCInfoMap &GNodeSCCInfo() const
     {
         return _NodeSCCAuxInfo;
     }

package/SVF-osx/Release-build/include/WPA/WPAFSSolver.h

@@ -69,31 +69,23 @@ protected:
         /// SCC detection
         this->getSCCDetector()->find();
 
+        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
+
         /// Both rep and sub nodes need to be processed later.
         /// Collect sub nodes from SCCDetector.
-        NodeStack revTopoStack;
-        NodeStack& topoStack = this->getSCCDetector()->topoNodeStack();
-        while (!topoStack.empty())
+        NodeStack revTopoStack = this->getSCCDetector()->revTopoNodeStack();
+        while (!revTopoStack.empty())
         {
-            NodeID nodeId = topoStack.top();
-            topoStack.pop();
+            NodeID nodeId = revTopoStack.top();
+            revTopoStack.pop();
             const NodeBS& subNodes = this->getSCCDetector()->subNodes(nodeId);
             for (NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it != eit; ++it)
             {
-                revTopoStack.push(*it);
+                /// restore the topological order.
+                nodeStack.push(*it);
             }
         }
 
-        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
-
-        /// restore the topological order.
-        while (!revTopoStack.empty())
-        {
-            NodeID nodeId = revTopoStack.top();
-            revTopoStack.pop();
-            nodeStack.push(nodeId);
-        }
-
         return nodeStack;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2201",
+  "version": "1.0.2203",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {