svf-lib 1.0.1605 → 1.0.1607

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

@@ -507,12 +507,6 @@ public:
     void print(std::ostream& os) const override;
 };
 
-/// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
-/// Converts an SVFType to corresponding LLVM::Type, then get the string
-/// representation of it. Use it only when you are debugging. Don't use
-/// it in any SVF algorithm because it relies on information stored in LLVM bc.
-std::string dumpLLVMType(const SVFType* svfType);
-
 // TODO: be explicit that this is a pair of 32-bit unsigneds?
 template <> struct Hash<NodePair>
 {

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

@@ -255,18 +255,14 @@ public:
         return sourceLoc;
     }
 
-    /// \note Use `os<<SVFvalue` or `svfValue.print(os)` when possible to avoid
-    /// string concatenation.
+    /// Needs to be implemented by a SVF front end
     std::string toString() const;
 
-    virtual void print(OutStream& os) const = 0;
-
     /// Overloading operator << for dumping ICFG node ID
     //@{
     friend OutStream& operator<<(OutStream &os, const SVFValue &value)
     {
-        value.print(os);
-        return os;
+        return os << value.toString();
     }
     //@}
 };
@@ -335,8 +331,6 @@ public:
         return node->getKind() == SVFFunc;
     }
 
-    void print(OutStream& os) const override;
-
     inline SVFLoopAndDomInfo* getLoopAndDomInfo()
     {
         return loopAndDom;
@@ -532,8 +526,6 @@ public:
         return node->getKind() == SVFBB;
     }
 
-    void print(OutStream& os) const override;
-
     inline const std::vector<const SVFInstruction*>& getInstructionList() const
     {
         return allInsts;
@@ -619,8 +611,6 @@ public:
                node->getKind() == SVFVCall;
     }
 
-    void print(OutStream& os) const override;
-
     inline const SVFBasicBlock* getParent() const
     {
         return bb;
@@ -817,7 +807,6 @@ public:
                node->getKind() == SVFBlackHole;
     }
 
-    void print(OutStream& os) const override;
 };
 
 class SVFGlobalValue : public SVFConstant
@@ -845,8 +834,6 @@ public:
     }
     SVFGlobalValue() = delete;
 
-    void print(OutStream& os) const override;
-
     inline const SVFValue* getDefGlobalForMultipleModule() const
     {
         if(realDefGlobal==nullptr)
@@ -880,8 +867,6 @@ public:
     }
     SVFArgument() = delete;
 
-    void print(OutStream& os) const override;
-
     inline const SVFFunction* getParent() const
     {
         return fun;
@@ -916,8 +901,6 @@ public:
     }
     SVFConstantData() = delete;
 
-    void print(OutStream& os) const override;
-
     static inline bool classof(const SVFValue *node)
     {
         return node->getKind() == SVFConstData ||
@@ -950,8 +933,6 @@ public:
     }
     SVFConstantInt() = delete;
 
-    void print(OutStream& os) const override;
-
     static inline bool classof(const SVFValue *node)
     {
         return node->getKind() == SVFConstInt;
@@ -985,8 +966,6 @@ public:
     }
     SVFConstantFP() = delete;
 
-    void print(OutStream& os) const override;
-
     inline double getFPValue () const
     {
         return dval;
@@ -1013,8 +992,6 @@ public:
     }
     SVFConstantNullPtr() = delete;
 
-    void print(OutStream& os) const override;
-
     static inline bool classof(const SVFValue *node)
     {
         return node->getKind() == SVFNullPtr;
@@ -1037,8 +1014,6 @@ public:
     }
     SVFBlackHoleValue() = delete;
 
-    void print(OutStream& os) const override;
-
     static inline bool classof(const SVFValue *node)
     {
         return node->getKind() == SVFBlackHole;
@@ -1064,8 +1039,6 @@ public:
     {
         return node->getKind() == SVFOther || node->getKind() == SVFMetaAsValue;
     }
-
-    void print(OutStream& os) const override;
 };
 
 /*
@@ -1090,8 +1063,6 @@ public:
     {
         return node->getKind() == SVFMetaAsValue;
     }
-
-    void print(OutStream& os) const override;
 };
 
 

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

@@ -171,9 +171,10 @@ public:
     static inline GEdgeFlag makeEdgeFlagWithAddionalOpnd(GEdgeKind k,
             const SVFVar* var)
     {
-        Var2LabelMap::const_iterator iter = var2LabelMap.find(var);
-        u64_t label = (iter != var2LabelMap.end()) ? iter->second
-                      : multiOpndLabelCounter++;
+        auto it_inserted = var2LabelMap.emplace(var, multiOpndLabelCounter);
+        if (it_inserted.second)
+            ++multiOpndLabelCounter;
+        u64_t label = it_inserted.first->second;
         return (label << EdgeKindMaskBits) | k;
     }
 
@@ -182,9 +183,10 @@ public:
     static inline GEdgeFlag makeEdgeFlagWithCallInst(GEdgeKind k,
             const ICFGNode* cs)
     {
-        Inst2LabelMap::const_iterator iter = inst2LabelMap.find(cs);
-        u64_t label = (iter != inst2LabelMap.end()) ? iter->second
-                      : callEdgeLabelCounter++;
+        auto it_inserted = inst2LabelMap.emplace(cs, callEdgeLabelCounter);
+        if (it_inserted.second)
+            ++callEdgeLabelCounter;
+        u64_t label = it_inserted.first->second;
         return (label << EdgeKindMaskBits) | k;
     }
 
@@ -193,9 +195,10 @@ public:
     static inline GEdgeFlag makeEdgeFlagWithStoreInst(GEdgeKind k,
             const ICFGNode* store)
     {
-        Inst2LabelMap::const_iterator iter = inst2LabelMap.find(store);
-        u64_t label = (iter != inst2LabelMap.end()) ? iter->second
-                      : storeEdgeLabelCounter++;
+        auto it_inserted = inst2LabelMap.emplace(store, storeEdgeLabelCounter);
+        if (it_inserted.second)
+            ++storeEdgeLabelCounter;
+        u64_t label = it_inserted.first->second;
         return (label << EdgeKindMaskBits) | k;
     }
 

package/package.json

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