svf-lib 1.0.1726 → 1.0.1728

package/SVF-linux/svf/include/Graphs/ICFGNode.h

@@ -341,13 +341,13 @@ public:
         return fun;
     }
 
-    /// Return actual return parameter
+    /// Return formal return parameter
     inline const SVFVar *getFormalRet() const
     {
         return formalRet;
     }
 
-    /// Add actual return parameter
+    /// Add formal return parameter
     inline void addFormalRet(const SVFVar *fr)
     {
         formalRet = fr;

package/SVF-linux/svf/include/SVFIR/SVFValue.h

@@ -418,7 +418,7 @@ public:
     inline const SVFBasicBlock* getExitBB() const
     {
         assert(hasBasicBlock() && "function does not have any Basicblock, external function?");
-        assert((!isNotRet && exitBlock) && "ensure the function has a single basic block containing a return instruction!");
+        assert((hasReturn() && exitBlock) && "ensure the function has a single basic block containing a return instruction!");
         return exitBlock;
     }
 
@@ -463,9 +463,9 @@ public:
         return isUncalled;
     }
 
-    inline bool isNotRetFunction() const
+    inline bool hasReturn() const
     {
-        return isNotRet;
+        return  !isNotRet;
     }
 
     inline const std::vector<std::string>& getAnnotations() const

package/SVF-osx/svf/include/SVFIR/SVFValue.h

@@ -318,6 +318,7 @@ private:
     std::vector<const SVFBasicBlock*> allBBs;   /// all BasicBlocks of this function
     std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
     std::vector<std::string> annotations; /// annotations of this function
+    SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
 
 protected:
     ///@{ attributes to be set only through Module builders e.g., LLVMModule
@@ -410,12 +411,17 @@ public:
         return allBBs.front();
     }
 
+    /// Carefully! when you call getExitBB, you need ensure the function has return instruction
+    /// more refer to: https://github.com/SVF-tools/SVF/pull/1262
     inline const SVFBasicBlock* getExitBB() const
     {
         assert(hasBasicBlock() && "function does not have any Basicblock, external function?");
-        return allBBs.back();
+        assert((!isNotRet && exitBlock) && "ensure the function has a single basic block containing a return instruction!");
+        return exitBlock;
     }
 
+    void setExitBlock(SVFBasicBlock *bb);
+
     inline const SVFBasicBlock* front() const
     {
         return getEntryBlock();
@@ -423,7 +429,11 @@ public:
 
     inline const SVFBasicBlock* back() const
     {
-        return getExitBB();
+        assert(hasBasicBlock() && "function does not have any Basicblock, external function?");
+        /// Carefully! 'back' is just the last basic block of function,
+        /// but not necessarily a exit basic block
+        /// more refer to: https://github.com/SVF-tools/SVF/pull/1262
+        return allBBs.back();
     }
 
     inline const_iterator begin() const
@@ -518,6 +528,7 @@ class SVFBasicBlock : public SVFValue
     friend class SVFIRWriter;
     friend class SVFIRReader;
     friend class SVFIRBuilder;
+    friend class SVFFunction;
 
 public:
     typedef std::vector<const SVFInstruction*>::const_iterator const_iterator;

package/SVF-osx/svf-llvm/include/SVF-LLVM/LLVMUtil.h

@@ -205,6 +205,9 @@ inline bool isArgOfUncalledFunction (const Value*  val)
 }
 //@}
 
+/// Return true if the function has a return instruction
+bool basicBlockHasRetInst(const BasicBlock* bb);
+
 /// Return true if the function has a return instruction reachable from function
 /// entry
 bool functionDoesNotRet(const Function* fun);

package/package.json

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