svf-lib 1.0.997 → 1.0.1000

package/SVF-linux/include/Graphs/GraphPrinter.h

@@ -33,6 +33,7 @@
 
 #include <system_error>
 #include <llvm/Support/ToolOutputFile.h>
+#include <llvm/Support/GraphWriter.h>		// for graph write
 #include <llvm/Support/FileSystem.h>		// for file open flag
 #include <llvm/ADT/GraphTraits.h>
 

package/SVF-linux/include/Graphs/SVFG.h

@@ -173,11 +173,6 @@ public:
         return getSVFGNode(getDef(pagNode));
     }
 
-    /// Return the corresponding SVFGNodes to a given llvm::Value.
-    /// return an empty list, if the no mapping is possible
-    std::set<const SVFGNode*> fromValue(const llvm::Value* value) const;
-
-
     /// Perform statistics
     void performStat();
 

package/SVF-linux/include/MSSA/MSSAMuChi.h

@@ -183,7 +183,7 @@ public:
     //@}
 
     /// Return load instruction
-    inline const LoadStmt* getLoadInst() const
+    inline const LoadStmt* getLoadStmt() const
     {
         return inst;
     }
@@ -482,7 +482,7 @@ public:
     }
 
     /// Get store instruction
-    inline const StoreStmt* getStoreInst() const
+    inline const StoreStmt* getStoreStmt() const
     {
         return inst;
     }

package/SVF-linux/include/SABER/SaberCheckerAPI.h

@@ -54,7 +54,7 @@ public:
         CK_FCLOSE		/// File close
     };
 
-    typedef llvm::StringMap<CHECKER_TYPE> TDAPIMap;
+    typedef Map<std::string, CHECKER_TYPE> TDAPIMap;
 
 private:
     /// API map, from a string to threadAPI type

package/SVF-linux/include/SVF-FE/BasicTypes.h

@@ -3,6 +3,7 @@
 
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/IntrinsicInst.h>
+#include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Metadata.h>
 #include <llvm/IR/DataLayout.h>
 
@@ -10,6 +11,9 @@
 
 #include <llvm/Support/SourceMgr.h>
 
+typedef llvm::LLVMContext LLVMContext;
+typedef llvm::Use Use;
+
 typedef llvm::SMDiagnostic SMDiagnostic;
 
 typedef llvm::MetadataAsValue MetadataAsValue;

package/SVF-linux/include/SVF-FE/LLVMModule.h

@@ -30,6 +30,7 @@
 #ifndef INCLUDE_SVF_FE_LLVMMODULE_H_
 #define INCLUDE_SVF_FE_LLVMMODULE_H_
 
+#include "SVF-FE/BasicTypes.h"
 #include "SVF-FE/CPPUtil.h"
 #include "Util/BasicTypes.h"
 #include "Util/SVFModule.h"

package/SVF-linux/include/Util/BasicTypes.h

@@ -53,7 +53,6 @@
 #include <llvm/Analysis/PostDominators.h>
 #include <llvm/Analysis/ScalarEvolutionExpressions.h>
 #include <llvm/ADT/GraphTraits.h>		// for Graphtraits
-#include <llvm/Support/GraphWriter.h>		// for graph write
 #include <llvm/IR/IRBuilder.h>		// for instrument svf.main
 #include <llvm/Transforms/Utils/Local.h>	// for FindDbgAddrUses
 #include <llvm/IR/DebugInfo.h>
@@ -68,7 +67,6 @@ class BddCond;
 
 
 /// LLVM Basic classes
-typedef llvm::LLVMContext LLVMContext;
 typedef llvm::Type Type;
 typedef llvm::Function Function;
 typedef llvm::BasicBlock BasicBlock;
@@ -80,7 +78,6 @@ typedef llvm::GlobalValue GlobalValue;
 typedef llvm::GlobalVariable GlobalVariable;
 typedef llvm::Module Module;
 typedef llvm::User User;
-typedef llvm::Use Use;
 typedef llvm::Loop Loop;
 typedef llvm::LoopInfo LoopInfo;
 #if LLVM_VERSION_MAJOR >= 12
@@ -94,7 +91,6 @@ typedef llvm::ModulePass ModulePass;
 typedef llvm::raw_string_ostream raw_string_ostream;
 typedef llvm::raw_fd_ostream raw_fd_ostream;
 typedef llvm::StringRef StringRef;
-typedef llvm::ToolOutputFile ToolOutputFile;
 
 /// LLVM types
 typedef llvm::StructType StructType;

package/SVF-linux/include/Util/ExtAPI.h

@@ -93,8 +93,7 @@ public:
 private:
 
     //Each Function name is mapped to its extf_t
-    //  (hash_map and map are much slower).
-    llvm::StringMap<extf_t> info;
+    Map<std::string, extf_t> info;
     //A cache of is_ext results for all SVFFunction*'s (hash_map is fastest).
     Map<const SVFFunction*, bool> isext_cache;
 
@@ -141,7 +140,7 @@ public:
             unsigned end = funName.substr(start + 1).find('.');
             funName = "llvm." + funName.substr(start + 1, end);
         }
-        llvm::StringMap<extf_t>::const_iterator it= info.find(funName);
+        Map<std::string, extf_t>::const_iterator it= info.find(funName);
         if(it == info.end())
             return EFT_OTHER;
         else

package/SVF-linux/include/Util/SVFBasicTypes.h

@@ -37,7 +37,6 @@
 
 #include <llvm/ADT/SparseBitVector.h>	// for points-to
 #include <llvm/Support/CommandLine.h>	// for command line options
-#include <llvm/ADT/StringMap.h>	// for StringMap
 
 #include <iostream>
 #include <vector>
@@ -129,7 +128,6 @@ template<typename Key, typename Value, typename Hash = Hash<Key>,
                   typedef std::deque<NodeID> NodeDeque;
                   typedef NodeSet EdgeSet;
                   typedef std::vector<u32_t> CallStrCxt;
-                  typedef llvm::StringMap<u32_t> StringMap;
 
                   typedef unsigned Version;
                   typedef Set<Version> VersionSet;

package/SVF-linux/include/Util/ThreadAPI.h

@@ -67,7 +67,7 @@ public:
         HARE_PAR_FOR
     };
 
-    typedef llvm::StringMap<TD_TYPE> TDAPIMap;
+    typedef Map<std::string, TD_TYPE> TDAPIMap;
 
 private:
     /// API map, from a string to threadAPI type
@@ -333,7 +333,7 @@ public:
     //@}
 
     void performAPIStat(SVFModule* m);
-    void statInit(llvm::StringMap<u32_t>& tdAPIStatMap);
+    void statInit(Map<std::string, u32_t>& tdAPIStatMap);
 };
 
 } // End namespace SVF

package/SVF-osx/include/Graphs/GraphPrinter.h

@@ -33,6 +33,7 @@
 
 #include <system_error>
 #include <llvm/Support/ToolOutputFile.h>
+#include <llvm/Support/GraphWriter.h>		// for graph write
 #include <llvm/Support/FileSystem.h>		// for file open flag
 #include <llvm/ADT/GraphTraits.h>
 

package/SVF-osx/include/Graphs/SVFG.h

@@ -173,11 +173,6 @@ public:
         return getSVFGNode(getDef(pagNode));
     }
 
-    /// Return the corresponding SVFGNodes to a given llvm::Value.
-    /// return an empty list, if the no mapping is possible
-    std::set<const SVFGNode*> fromValue(const llvm::Value* value) const;
-
-
     /// Perform statistics
     void performStat();
 

package/SVF-osx/include/MSSA/MSSAMuChi.h

@@ -183,7 +183,7 @@ public:
     //@}
 
     /// Return load instruction
-    inline const LoadStmt* getLoadInst() const
+    inline const LoadStmt* getLoadStmt() const
     {
         return inst;
     }
@@ -482,7 +482,7 @@ public:
     }
 
     /// Get store instruction
-    inline const StoreStmt* getStoreInst() const
+    inline const StoreStmt* getStoreStmt() const
     {
         return inst;
     }

package/SVF-osx/include/SABER/SaberCheckerAPI.h

@@ -54,7 +54,7 @@ public:
         CK_FCLOSE		/// File close
     };
 
-    typedef llvm::StringMap<CHECKER_TYPE> TDAPIMap;
+    typedef Map<std::string, CHECKER_TYPE> TDAPIMap;
 
 private:
     /// API map, from a string to threadAPI type

package/SVF-osx/include/SVF-FE/BasicTypes.h

@@ -3,6 +3,7 @@
 
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/IntrinsicInst.h>
+#include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Metadata.h>
 #include <llvm/IR/DataLayout.h>
 
@@ -10,6 +11,9 @@
 
 #include <llvm/Support/SourceMgr.h>
 
+typedef llvm::LLVMContext LLVMContext;
+typedef llvm::Use Use;
+
 typedef llvm::SMDiagnostic SMDiagnostic;
 
 typedef llvm::MetadataAsValue MetadataAsValue;

package/SVF-osx/include/SVF-FE/LLVMModule.h

@@ -30,6 +30,7 @@
 #ifndef INCLUDE_SVF_FE_LLVMMODULE_H_
 #define INCLUDE_SVF_FE_LLVMMODULE_H_
 
+#include "SVF-FE/BasicTypes.h"
 #include "SVF-FE/CPPUtil.h"
 #include "Util/BasicTypes.h"
 #include "Util/SVFModule.h"

package/SVF-osx/include/Util/BasicTypes.h

@@ -53,7 +53,6 @@
 #include <llvm/Analysis/PostDominators.h>
 #include <llvm/Analysis/ScalarEvolutionExpressions.h>
 #include <llvm/ADT/GraphTraits.h>		// for Graphtraits
-#include <llvm/Support/GraphWriter.h>		// for graph write
 #include <llvm/IR/IRBuilder.h>		// for instrument svf.main
 #include <llvm/Transforms/Utils/Local.h>	// for FindDbgAddrUses
 #include <llvm/IR/DebugInfo.h>
@@ -68,7 +67,6 @@ class BddCond;
 
 
 /// LLVM Basic classes
-typedef llvm::LLVMContext LLVMContext;
 typedef llvm::Type Type;
 typedef llvm::Function Function;
 typedef llvm::BasicBlock BasicBlock;
@@ -80,7 +78,6 @@ typedef llvm::GlobalValue GlobalValue;
 typedef llvm::GlobalVariable GlobalVariable;
 typedef llvm::Module Module;
 typedef llvm::User User;
-typedef llvm::Use Use;
 typedef llvm::Loop Loop;
 typedef llvm::LoopInfo LoopInfo;
 #if LLVM_VERSION_MAJOR >= 12
@@ -94,7 +91,6 @@ typedef llvm::ModulePass ModulePass;
 typedef llvm::raw_string_ostream raw_string_ostream;
 typedef llvm::raw_fd_ostream raw_fd_ostream;
 typedef llvm::StringRef StringRef;
-typedef llvm::ToolOutputFile ToolOutputFile;
 
 /// LLVM types
 typedef llvm::StructType StructType;

package/SVF-osx/include/Util/ExtAPI.h

@@ -93,8 +93,7 @@ public:
 private:
 
     //Each Function name is mapped to its extf_t
-    //  (hash_map and map are much slower).
-    llvm::StringMap<extf_t> info;
+    Map<std::string, extf_t> info;
     //A cache of is_ext results for all SVFFunction*'s (hash_map is fastest).
     Map<const SVFFunction*, bool> isext_cache;
 
@@ -141,7 +140,7 @@ public:
             unsigned end = funName.substr(start + 1).find('.');
             funName = "llvm." + funName.substr(start + 1, end);
         }
-        llvm::StringMap<extf_t>::const_iterator it= info.find(funName);
+        Map<std::string, extf_t>::const_iterator it= info.find(funName);
         if(it == info.end())
             return EFT_OTHER;
         else

package/SVF-osx/include/Util/SVFBasicTypes.h

@@ -37,7 +37,6 @@
 
 #include <llvm/ADT/SparseBitVector.h>	// for points-to
 #include <llvm/Support/CommandLine.h>	// for command line options
-#include <llvm/ADT/StringMap.h>	// for StringMap
 
 #include <iostream>
 #include <vector>
@@ -129,7 +128,6 @@ template<typename Key, typename Value, typename Hash = Hash<Key>,
                   typedef std::deque<NodeID> NodeDeque;
                   typedef NodeSet EdgeSet;
                   typedef std::vector<u32_t> CallStrCxt;
-                  typedef llvm::StringMap<u32_t> StringMap;
 
                   typedef unsigned Version;
                   typedef Set<Version> VersionSet;

package/SVF-osx/include/Util/ThreadAPI.h

@@ -67,7 +67,7 @@ public:
         HARE_PAR_FOR
     };
 
-    typedef llvm::StringMap<TD_TYPE> TDAPIMap;
+    typedef Map<std::string, TD_TYPE> TDAPIMap;
 
 private:
     /// API map, from a string to threadAPI type
@@ -333,7 +333,7 @@ public:
     //@}
 
     void performAPIStat(SVFModule* m);
-    void statInit(llvm::StringMap<u32_t>& tdAPIStatMap);
+    void statInit(Map<std::string, u32_t>& tdAPIStatMap);
 };
 
 } // End namespace SVF

package/package.json

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