svf-lib 1.0.1544 → 1.0.1546

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

@@ -264,6 +264,7 @@ private:
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
     ///< array
+
 protected:
     SVFType(bool svt, SVFTyKind k)
         : kind(k), getPointerToTy(nullptr), typeinfo(nullptr),
@@ -280,9 +281,11 @@ public:
         return kind;
     }
 
-    /// Needs to be implemented by a specific SVF front end (e.g., the
-    /// implementation in LLVMUtil)
-    virtual const std::string toString() const;
+    /// Note: Use `os<<svfType` or `svfType.print(os)` when possible to avoid
+    /// string concatenation.
+    std::string toString() const;
+
+    virtual void print(std::ostream& OS) const = 0;
 
     inline void setPointerTo(const SVFPointerType* ty)
     {
@@ -323,6 +326,8 @@ public:
     }
 };
 
+std::ostream& operator<<(std::ostream& OS, const SVFType& type);
+
 class SVFPointerType : public SVFType
 {
     friend class SVFIRWriter;
@@ -344,6 +349,8 @@ public:
     {
         return ptrElementType;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFIntegerType : public SVFType
@@ -354,6 +361,8 @@ public:
     {
         return node->getKind() == SVFIntegerTy;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFFunctionType : public SVFType
@@ -377,36 +386,89 @@ public:
     {
         return retTy;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFStructType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    std::string name;
+
 public:
     SVFStructType() : SVFType(false, SVFStructTy) {}
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFStructTy;
     }
+
+    void print(std::ostream& OS) const override;
+
+    std::string& getName()
+    {
+        return name;
+    }
 };
 
 class SVFArrayType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    unsigned numOfElement; /// For printing
+    SVFType* typeOfElement; /// For printing
+
 public:
-    SVFArrayType() : SVFType(false, SVFArrayTy) {}
+    SVFArrayType()
+        : SVFType(false, SVFArrayTy), numOfElement(0), typeOfElement(nullptr)
+    {
+    }
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFArrayTy;
     }
+
+    void print(std::ostream& OS) const override;
+
+    void setTypeOfElement(SVFType* elemType)
+    {
+        typeOfElement = elemType;
+    }
+
+    void setNumOfElement(unsigned elemNum)
+    {
+        numOfElement = elemNum;
+    }
 };
 
 class SVFOtherType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    std::string repr; /// Field representation for printing
+
 public:
     SVFOtherType(bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy) {}
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFOtherTy;
     }
+
+    std::string& getRepr()
+    {
+        return repr;
+    }
+
+    void print(std::ostream& OS) const override;
 };
 
 // TODO: be explicit that this is a pair of 32-bit unsigneds?

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

@@ -264,6 +264,7 @@ private:
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
     ///< array
+
 protected:
     SVFType(bool svt, SVFTyKind k)
         : kind(k), getPointerToTy(nullptr), typeinfo(nullptr),
@@ -280,9 +281,11 @@ public:
         return kind;
     }
 
-    /// Needs to be implemented by a specific SVF front end (e.g., the
-    /// implementation in LLVMUtil)
-    virtual const std::string toString() const;
+    /// Note: Use `os<<svfType` or `svfType.print(os)` when possible to avoid
+    /// string concatenation.
+    std::string toString() const;
+
+    virtual void print(std::ostream& OS) const = 0;
 
     inline void setPointerTo(const SVFPointerType* ty)
     {
@@ -323,6 +326,8 @@ public:
     }
 };
 
+std::ostream& operator<<(std::ostream& OS, const SVFType& type);
+
 class SVFPointerType : public SVFType
 {
     friend class SVFIRWriter;
@@ -344,6 +349,8 @@ public:
     {
         return ptrElementType;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFIntegerType : public SVFType
@@ -354,6 +361,8 @@ public:
     {
         return node->getKind() == SVFIntegerTy;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFFunctionType : public SVFType
@@ -377,36 +386,89 @@ public:
     {
         return retTy;
     }
+
+    void print(std::ostream& OS) const override;
 };
 
 class SVFStructType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    std::string name;
+
 public:
     SVFStructType() : SVFType(false, SVFStructTy) {}
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFStructTy;
     }
+
+    void print(std::ostream& OS) const override;
+
+    std::string& getName()
+    {
+        return name;
+    }
 };
 
 class SVFArrayType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    unsigned numOfElement; /// For printing
+    SVFType* typeOfElement; /// For printing
+
 public:
-    SVFArrayType() : SVFType(false, SVFArrayTy) {}
+    SVFArrayType()
+        : SVFType(false, SVFArrayTy), numOfElement(0), typeOfElement(nullptr)
+    {
+    }
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFArrayTy;
     }
+
+    void print(std::ostream& OS) const override;
+
+    void setTypeOfElement(SVFType* elemType)
+    {
+        typeOfElement = elemType;
+    }
+
+    void setNumOfElement(unsigned elemNum)
+    {
+        numOfElement = elemNum;
+    }
 };
 
 class SVFOtherType : public SVFType
 {
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+private:
+    std::string repr; /// Field representation for printing
+
 public:
     SVFOtherType(bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy) {}
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFOtherTy;
     }
+
+    std::string& getRepr()
+    {
+        return repr;
+    }
+
+    void print(std::ostream& OS) const override;
 };
 
 // TODO: be explicit that this is a pair of 32-bit unsigneds?

package/package.json

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