svf-tools 1.0.749 → 1.0.751

package/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/lib/SVFIR/SVFValue.cpp

@@ -122,13 +122,6 @@ bool SVFLoopAndDomInfo::isLoopHeader(const SVFBasicBlock* bb) const
     return false;
 }
 
-std::string SVFValue::toString() const
-{
-    std::ostringstream os;
-    print(os);
-    return os.str();
-}
-
 SVFFunction::SVFFunction(const SVFType* ty, const SVFFunctionType* ft,
                          bool declare, bool intrinsic, bool adt, bool varg,
                          SVFLoopAndDomInfo* ld)
@@ -243,91 +236,3 @@ SVFInstruction::SVFInstruction(const SVFType* ty, const SVFBasicBlock* b,
     : SVFValue(ty, k), bb(b), terminator(tm), ret(isRet)
 {
 }
-
-void SVFFunction::print(OutStream& os) const
-{
-    os << "fun " << getName();
-}
-
-void SVFBasicBlock::print(OutStream& os) const
-{
-    os << "BB";
-    if (!getName().empty())
-        os << ' ' << getName();
-    os << " in " << getFunction()->getName();
-}
-
-void SVFInstruction::print(OutStream& os) const
-{
-    os << '`' << getName() << "` in " << getFunction()->getName();
-    const std::string& bbName = getParent()->getName();
-    if (bbName.size())
-        os << " BB " << bbName;
-}
-
-void SVFConstant::print(OutStream& os) const
-{
-    os << "Const " << getName();
-}
-
-void SVFGlobalValue::print(OutStream& os) const
-{
-    os << "@" << getName();
-}
-
-void SVFArgument::print(OutStream& os) const
-{
-    os << "arg %" << getName() << " of " << getParent()->getName();
-}
-
-void SVFConstantData::print(OutStream& os) const
-{
-    // N.B. Haven't found instance of this class so far
-    os << "ConstData " << getName();
-}
-
-void SVFConstantInt::print(OutStream& os) const
-{
-    os << "ConstInt ";
-    if (!getName().empty())
-        os << getName() << ' ';
-    auto ty = dyn_cast<SVFIntegerType>(getType());
-    assert(ty && "ConstantInt has non-integer type?");
-    os << *ty << ' ';
-    if (ty->isSigned())
-        os << getSExtValue();
-    else
-        os << getZExtValue();
-}
-
-void SVFConstantFP::print(OutStream& os) const
-{
-    os << "ConstFP ";
-    if (!getName().empty())
-        os << getName() << ' ';
-    os << *getType() << ' ' << getFPValue();
-}
-
-void SVFConstantNullPtr::print(OutStream& os) const
-{
-    os << "ConstNull " << *getType();
-    if (!getName().empty())
-        os << ' ' << getName();
-}
-
-void SVFBlackHoleValue::print(OutStream& os) const
-{
-    os << "BlackHole " << *getType();
-    if (!getName().empty())
-        os << ' ' << getName();
-}
-
-void SVFOtherValue::print(OutStream& os) const
-{
-    os << "OtherVal " << getName();
-}
-
-void SVFMetadataAsValue::print(OutStream& os) const
-{
-    os << "MetaDataVal " << getName();
-}

package/svf-llvm/lib/LLVMModule.cpp

@@ -72,19 +72,6 @@ using namespace SVF;
 LLVMModuleSet* LLVMModuleSet::llvmModuleSet = nullptr;
 bool LLVMModuleSet::preProcessed = false;
 
-/// Helper function to summarize a long string
-static void shortenLongInfo(std::string& info, unsigned bestLen = 15)
-{
-    if (info.size() <= bestLen)
-        return;
-    // If it is of form "name = value", keep on the name part
-    size_t index = info.find(" =");
-    if (index != std::string::npos)
-        info.resize(index);
-    else
-        info.resize(bestLen);
-}
-
 LLVMModuleSet::LLVMModuleSet()
     : symInfo(SymbolTableInfo::SymbolInfo()),
       svfModule(SVFModule::getSVFModule()), cxts(nullptr)
@@ -303,20 +290,6 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
                                        SVFUtil::isa<ReturnInst>(inst));
             }
 
-            // Set instruction's string representation
-            if (inst.hasName() && !inst.getName().empty())
-            {
-                svfInst->setName(inst.getName().str());
-            }
-            else
-            {
-                std::string str = LLVMUtil::llvmToString(inst);
-                auto it = str.begin(), ite = str.end();
-                while (it != ite && std::isspace(*it))
-                    ++it;
-                // 0xf (15) is the max length a local string can hold
-                svfInst->setName({it, std::min(it + 0xf, ite)});
-            }
             svfBB->addInstruction(svfInst);
             addInstructionMap(&inst, svfInst);
         }
@@ -1009,29 +982,6 @@ SVFConstant* LLVMModuleSet::getOtherSVFConstant(const Constant* oc)
         SVFConstant* svfoc = new SVFConstant(getSVFType(oc->getType()));
         svfModule->addConstant(svfoc);
         addOtherConstantMap(oc,svfoc);
-
-        // Setting up string representation.
-        // Usually is a bitcast from a global variable's address
-        std::string str = LLVMUtil::llvmToString(*oc);
-        const char* spaceChars = " \t\n\v\f\r";
-        size_t space = str.find_first_of(spaceChars);
-        const int maxLen = 62; // Arbitrary chosen small number that fits string
-        // within one line
-        if (space != str.npos &&
-                (space = str.find_first_of(spaceChars, space + 1)) != str.npos)
-        {
-            size_t name = str.find('@', space);
-            str.erase(space, name - space);
-        }
-        else if (str.size() > maxLen)
-        {
-            int extra = str.size() - maxLen;
-            int half = maxLen / 2;
-            str[half++] = '~';
-            str.erase(half, half + extra);
-        }
-        svfoc->setName(std::move(str));
-
         return svfoc;
     }
 }
@@ -1049,14 +999,6 @@ SVFOtherValue* LLVMModuleSet::getSVFOtherValue(const Value* ov)
             SVFUtil::isa<MetadataAsValue>(ov)
             ? new SVFMetadataAsValue(getSVFType(ov->getType()))
             : new SVFOtherValue(getSVFType(ov->getType()));
-        if (ov->hasName())
-            svfov->setName(ov->getName().str());
-        else
-        {
-            auto str = LLVMUtil::llvmToString(*ov);
-            shortenLongInfo(str, 30);
-            svfov->setName(std::move(str));
-        }
         svfModule->addOtherValue(svfov);
         addOtherValueMap(ov,svfov);
         return svfov;

package/svf-llvm/lib/LLVMUtil.cpp

@@ -1035,43 +1035,28 @@ s32_t LLVMUtil::getVCallIdx(const CallBase* cs)
 
 namespace SVF
 {
-std::string dumpLLVMValue(const SVFValue* svfValue)
+std::string SVFValue::toString() const
 {
     std::string str;
     llvm::raw_string_ostream rawstr(str);
-    if (LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(svfValue) == nullptr)
+    if (const SVF::SVFFunction* fun = SVFUtil::dyn_cast<SVFFunction>(this))
     {
-        assert((SVFUtil::isa<SVFInstruction, SVFBasicBlock>(svfValue)) &&
-               "Manually created SVF call inst, actual parameter and "
-               "BasicBlock by ExtAPI do not have LLVM value!");
-        rawstr << svfValue->getName();
-        return rawstr.str();
+        rawstr << "Function: " << fun->getName() << " ";
+    }
+    else if (const SVFBasicBlock* bb = SVFUtil::dyn_cast<SVFBasicBlock>(this))
+    {
+        rawstr << "BasicBlock: " << bb->getName() << " ";
     }
     else
     {
-        if (const SVF::SVFFunction* fun = SVFUtil::dyn_cast<SVFFunction>(svfValue))
-        {
-            rawstr << "Function: " << fun->getName() << " ";
-        }
-        else if (const SVFBasicBlock* bb = SVFUtil::dyn_cast<SVFBasicBlock>(svfValue))
-        {
-            rawstr << "BasicBlock: " << bb->getName() << " ";
-        }
+        auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
+        if (llvmVal)
+            rawstr << " " << *llvmVal << " ";
         else
-        {
-            const Value* val =
-                LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(svfValue);
-            rawstr << " " << *val << " ";
-        }
-        rawstr << svfValue->getSourceLoc();
-        return rawstr.str();
+            rawstr << " No llvmVal found";
     }
-}
-
-std::string dumpLLVMType(const SVFType* svfType)
-{
-    const Type* ty = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(svfType);
-    return LLVMUtil::llvmToString(*ty);
+    rawstr << this->getSourceLoc();
+    return rawstr.str();
 }
 
 } // namespace SVF