svf-tools 1.0.596 → 1.0.597

package/include/Util/iterator.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_ITERATOR_H
-#define LLVM_ADT_ITERATOR_H
+#ifndef UTIL_ITERATOR_H
+#define UTIL_ITERATOR_H
 
 #include "Util/iterator_range.h"
 #include <cstddef>
@@ -15,7 +15,7 @@
 #include <type_traits>
 #include <utility>
 
-namespace llvm
+namespace SVF
 {
 
 /// CRTP base class which implements the entire standard iterator facade
@@ -36,7 +36,7 @@ namespace llvm
 /// terms of addition of one. These aren't equivalent for all iterator
 /// categories, and respecting that adds a lot of complexity for little gain.
 ///
-/// Classes wishing to use `iterator_facade_base` should implement the following
+/// Classes wishing to use `iter_facade_base` should implement the following
 /// methods:
 ///
 /// Forward Iterators:
@@ -64,7 +64,7 @@ namespace llvm
 template <typename DerivedT, typename IteratorCategoryT, typename T,
           typename DifferenceTypeT = std::ptrdiff_t, typename PointerT = T *,
           typename ReferenceT = T &>
-class iterator_facade_base
+class iter_facade_base
 {
 public:
     using iterator_category = IteratorCategoryT;
@@ -89,7 +89,7 @@ protected:
     /// reference via a conversion operator.
     class ReferenceProxy
     {
-        friend iterator_facade_base;
+        friend iter_facade_base;
 
         DerivedT I;
 
@@ -105,7 +105,7 @@ protected:
 public:
     DerivedT operator+(DifferenceTypeT n) const
     {
-        static_assert(std::is_base_of<iterator_facade_base, DerivedT>::value,
+        static_assert(std::is_base_of<iter_facade_base, DerivedT>::value,
                       "Must pass the derived type to this template!");
         static_assert(
             IsRandomAccess,
@@ -133,7 +133,7 @@ public:
 
     DerivedT &operator++()
     {
-        static_assert(std::is_base_of<iterator_facade_base, DerivedT>::value,
+        static_assert(std::is_base_of<iter_facade_base, DerivedT>::value,
                       "Must pass the derived type to this template!");
         return static_cast<DerivedT *>(this)->operator+=(1);
     }
@@ -232,20 +232,20 @@ template <
         std::is_same<T, typename std::iterator_traits<
                          WrappedIteratorT>::value_type>::value,
         typename std::iterator_traits<WrappedIteratorT>::reference, T &>>
-class iterator_adaptor_base
-    : public iterator_facade_base<DerivedT, IteratorCategoryT, T,
+class iter_adaptor_base
+    : public iter_facade_base<DerivedT, IteratorCategoryT, T,
       DifferenceTypeT, PointerT, ReferenceT>
 {
-    using BaseT = typename iterator_adaptor_base::iterator_facade_base;
+    using BaseT = typename iter_adaptor_base::iter_facade_base;
 
 protected:
     WrappedIteratorT I;
 
-    iterator_adaptor_base() = default;
+    iter_adaptor_base() = default;
 
-    explicit iterator_adaptor_base(WrappedIteratorT u) : I(std::move(u))
+    explicit iter_adaptor_base(WrappedIteratorT u) : I(std::move(u))
     {
-        static_assert(std::is_base_of<iterator_adaptor_base, DerivedT>::value,
+        static_assert(std::is_base_of<iter_adaptor_base, DerivedT>::value,
                       "Must pass the derived type to this template!");
     }
 
@@ -300,13 +300,13 @@ public:
         return *static_cast<DerivedT *>(this);
     }
 
-    friend bool operator==(const iterator_adaptor_base &LHS,
-                           const iterator_adaptor_base &RHS)
+    friend bool operator==(const iter_adaptor_base &LHS,
+                           const iter_adaptor_base &RHS)
     {
         return LHS.I == RHS.I;
     }
-    friend bool operator<(const iterator_adaptor_base &LHS,
-                          const iterator_adaptor_base &RHS)
+    friend bool operator<(const iter_adaptor_base &LHS,
+                          const iter_adaptor_base &RHS)
     {
         static_assert(
             BaseT::IsRandomAccess,
@@ -327,21 +327,21 @@ public:
 /// which is implemented with some iterator over T*s:
 ///
 /// \code
-///   using iterator = pointee_iterator<SmallVectorImpl<T *>::iterator>;
+///   using iterator = pointee_iter<SmallVectorImpl<T *>::iterator>;
 /// \endcode
 template <typename WrappedIteratorT,
           typename T = std::remove_reference_t<decltype(
                       **std::declval<WrappedIteratorT>())>>
-struct pointee_iterator
-    : iterator_adaptor_base<
-      pointee_iterator<WrappedIteratorT, T>, WrappedIteratorT,
+struct pointee_iter
+    : iter_adaptor_base<
+      pointee_iter<WrappedIteratorT, T>, WrappedIteratorT,
       typename std::iterator_traits<WrappedIteratorT>::iterator_category,
       T>
 {
-    pointee_iterator() = default;
+    pointee_iter() = default;
     template <typename U>
-    pointee_iterator(U &&u)
-        : pointee_iterator::iterator_adaptor_base(std::forward<U &&>(u)) {}
+    pointee_iter(U &&u)
+        : pointee_iter::iter_adaptor_base(std::forward<U &&>(u)) {}
 
     T &operator*() const
     {
@@ -351,10 +351,10 @@ struct pointee_iterator
 
 template <typename RangeT, typename WrappedIteratorT =
           decltype(std::begin(std::declval<RangeT>()))>
-iterator_range<pointee_iterator<WrappedIteratorT>>
-        make_pointee_range(RangeT &&Range)
+iter_range<pointee_iter<WrappedIteratorT>>
+                                        make_pointee_range(RangeT &&Range)
 {
-    using PointeeIteratorT = pointee_iterator<WrappedIteratorT>;
+    using PointeeIteratorT = pointee_iter<WrappedIteratorT>;
     return make_range(PointeeIteratorT(std::begin(std::forward<RangeT>(Range))),
                       PointeeIteratorT(std::end(std::forward<RangeT>(Range))));
 }
@@ -362,7 +362,7 @@ iterator_range<pointee_iterator<WrappedIteratorT>>
 template <typename WrappedIteratorT,
           typename T = decltype(&*std::declval<WrappedIteratorT>())>
 class pointer_iterator
-    : public iterator_adaptor_base<
+    : public iter_adaptor_base<
       pointer_iterator<WrappedIteratorT, T>, WrappedIteratorT,
       typename std::iterator_traits<WrappedIteratorT>::iterator_category,
       T>
@@ -373,7 +373,7 @@ public:
     pointer_iterator() = default;
 
     explicit pointer_iterator(WrappedIteratorT u)
-        : pointer_iterator::iterator_adaptor_base(std::move(u)) {}
+        : pointer_iterator::iter_adaptor_base(std::move(u)) {}
 
     T &operator*()
     {
@@ -387,7 +387,7 @@ public:
 
 template <typename RangeT, typename WrappedIteratorT =
           decltype(std::begin(std::declval<RangeT>()))>
-iterator_range<pointer_iterator<WrappedIteratorT>>
+iter_range<pointer_iterator<WrappedIteratorT>>
         make_pointer_range(RangeT &&Range)
 {
     using PointerIteratorT = pointer_iterator<WrappedIteratorT>;
@@ -400,7 +400,7 @@ template <typename WrappedIteratorT,
                       **std::declval<WrappedIteratorT>())>,
           typename T2 = std::add_pointer_t<T1>>
 using raw_pointer_iterator =
-    pointer_iterator<pointee_iterator<WrappedIteratorT, T1>, T2>;
+    pointer_iterator<pointee_iter<WrappedIteratorT, T1>, T2>;
 
 } // end namespace llvm
 

package/include/Util/iterator_range.h

@@ -1,4 +1,4 @@
-//===- iterator_range.h - A range adaptor for iterators ---------*- C++ -*-===//
+//===- iter_range.h - A range adaptor for iterators ---------*- C++ -*-===//
 //
 // From the LLVM Project with some modifications, under the Apache License v2.0
 // with LLVM Exceptions. See https://llvm.org/LICENSE.txt for license information.
@@ -15,12 +15,12 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ADT_ITERATOR_RANGE_H
-#define LLVM_ADT_ITERATOR_RANGE_H
+#ifndef UTIL_ITERATOR_RANGE_H
+#define UTIL_ITERATOR_RANGE_H
 
 #include <utility>
 
-namespace llvm
+namespace SVF
 {
 
 /// A range adaptor for a pair of iterators.
@@ -28,7 +28,7 @@ namespace llvm
 /// This just wraps two iterators into a range-compatible interface. Nothing
 /// fancy at all.
 template <typename IteratorT>
-class iterator_range
+class iter_range
 {
     IteratorT begin_iterator, end_iterator;
 
@@ -36,10 +36,10 @@ public:
     //TODO: Add SFINAE to test that the Container's iterators match the range's
     //      iterators.
     template <typename Container>
-    iterator_range(Container &&c)
+    iter_range(Container &&c)
     //TODO: Consider ADL/non-member begin/end calls.
         : begin_iterator(c.begin()), end_iterator(c.end()) {}
-    iterator_range(IteratorT begin_iterator, IteratorT end_iterator)
+    iter_range(IteratorT begin_iterator, IteratorT end_iterator)
         : begin_iterator(std::move(begin_iterator)),
           end_iterator(std::move(end_iterator)) {}
 
@@ -61,14 +61,14 @@ public:
 ///
 /// This provides a bit of syntactic sugar to make using sub-ranges
 /// in for loops a bit easier. Analogous to std::make_pair().
-template <class T> iterator_range<T> make_range(T x, T y)
+template <class T> iter_range<T> make_range(T x, T y)
 {
-    return iterator_range<T>(std::move(x), std::move(y));
+    return iter_range<T>(std::move(x), std::move(y));
 }
 
-template <typename T> iterator_range<T> make_range(std::pair<T, T> p)
+template <typename T> iter_range<T> make_range(std::pair<T, T> p)
 {
-    return iterator_range<T>(std::move(p.first), std::move(p.second));
+    return iter_range<T>(std::move(p.first), std::move(p.second));
 }
 
 }

package/include/WPA/WPASolver.h

@@ -45,7 +45,7 @@ class WPASolver
 
 public:
     ///Define the GTraits and node iterator for printing
-    typedef llvm::GraphTraits<GraphType> GTraits;
+    typedef SVF::GenericGraphTraits<GraphType> GTraits;
     typedef typename GTraits::NodeRef           GNODE;
     typedef typename GTraits::EdgeType          GEDGE;
     typedef typename GTraits::ChildIteratorType child_iterator;

package/lib/Graphs/CFLGraph.cpp

@@ -74,10 +74,10 @@ void CFLGraph::dump(const std::string& filename)
 
 void CFLGraph::view()
 {
-    llvm::ViewGraph(this, "CFL Graph");
+    SVF::ViewGraph(this, "CFL Graph");
 }
 
-namespace llvm
+namespace SVF
 {
 /*!
  * Write CFL graph into dot file for debugging

package/lib/Graphs/CHG.cpp

@@ -224,10 +224,10 @@ void CHGraph::dump(const std::string& filename)
 
 void CHGraph::view()
 {
-    llvm::ViewGraph(this, "Class Hierarchy Graph");
+    SVF::ViewGraph(this, "Class Hierarchy Graph");
 }
 
-namespace llvm
+namespace SVF
 {
 
 /*!

package/lib/Graphs/ConsG.cpp

@@ -625,7 +625,7 @@ void ConstraintGraph::print()
  */
 void ConstraintGraph::view()
 {
-    llvm::ViewGraph(this, "Constraint Graph");
+    SVF::ViewGraph(this, "Constraint Graph");
 }
 
 /// Iterators of direct edges for ConsGNode
@@ -698,7 +698,7 @@ ConstraintNode::const_iterator ConstraintNode::directInEdgeEnd() const
 /*!
  * GraphTraits specialization for constraint graph
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>

package/lib/Graphs/GraphWriter.cpp

@@ -9,7 +9,7 @@
 
 #include <string>
 
-std::string llvm::DOT::EscapeStr(const std::string &Label)
+std::string SVF::DOT::EscapeStr(const std::string &Label)
 {
     std::string Str(Label);
     for (unsigned i = 0; i != Str.length(); ++i)

package/lib/Graphs/ICFG.cpp

@@ -449,7 +449,7 @@ void ICFG::dump(const std::string& file, bool simple)
  */
 void ICFG::view()
 {
-    llvm::ViewGraph(this, "Interprocedural Control-Flow Graph");
+    SVF::ViewGraph(this, "Interprocedural Control-Flow Graph");
 }
 
 /*!
@@ -517,7 +517,7 @@ void ICFG::updateCallGraph(PTACallGraph* callgraph)
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>

package/lib/Graphs/IRGraph.cpp

@@ -109,11 +109,11 @@ void IRGraph::dump(std::string name)
  */
 void IRGraph::view()
 {
-    llvm::ViewGraph(this, "ProgramAssignmentGraph");
+    SVF::ViewGraph(this, "ProgramAssignmentGraph");
 }
 
 
-namespace llvm
+namespace SVF
 {
 /*!
  * Write value flow graph into dot file for debugging

package/lib/Graphs/PTACallGraph.cpp

@@ -321,10 +321,10 @@ void PTACallGraph::dump(const std::string& filename)
 
 void PTACallGraph::view()
 {
-    llvm::ViewGraph(this, "Call Graph");
+    SVF::ViewGraph(this, "Call Graph");
 }
 
-namespace llvm
+namespace SVF
 {
 
 /*!

package/lib/Graphs/SVFG.cpp

@@ -761,7 +761,7 @@ void SVFG::performStat()
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>

package/lib/Graphs/VFG.cpp

@@ -935,7 +935,7 @@ void VFG::dump(const std::string& file, bool simple)
  */
 void VFG::view()
 {
-    llvm::ViewGraph(this, "Value Flow Graph");
+    SVF::ViewGraph(this, "Value Flow Graph");
 }
 
 
@@ -1091,7 +1091,7 @@ const SVFValue* ArgumentVFGNode::getValue() const
 /*!
  * GraphTraits specialization
  */
-namespace llvm
+namespace SVF
 {
 template<>
 struct DOTGraphTraits<VFG*> : public DOTGraphTraits<SVFIR*>

package/lib/MTA/TCT.cpp

@@ -557,7 +557,7 @@ TCTEdge* TCT::getGraphEdge(TCTNode* src, TCTNode* dst, TCTEdge::CEDGEK kind)
     }
     return nullptr;
 }
-namespace llvm
+namespace SVF
 {
 
 /*!

package/lib/SVF-LLVM/LLVMModule.cpp

@@ -848,8 +848,6 @@ void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
         svffun->setIsUncalledFunction(LLVMUtil::isUncalledFunction(func));
         svffun->setDefFunForMultipleModule(getSVFFunction(LLVMUtil::getDefFunForMultipleModule(func)));
     }
-    if (val->hasName())
-        svfvalue->setHasName();
 
     svfvalue->setSourceLoc(LLVMUtil::getSourceLoc(val));
 }

package/lib/SVF-LLVM/LLVMUtil.cpp

@@ -636,6 +636,46 @@ void LLVMUtil::getPrevInsts(const Instruction* curInst, std::vector<const Instru
     }
 }
 
+/// Check whether this value points-to a constant object
+bool LLVMUtil::isConstantObjSym(const SVFValue* val)
+{
+    return isConstantObjSym(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(val));
+}
+
+/*!
+ * Check whether this value points-to a constant object
+ */
+bool LLVMUtil::isConstantObjSym(const Value* val)
+{
+    if (const GlobalVariable* v = SVFUtil::dyn_cast<GlobalVariable>(val))
+    {
+        if (cppUtil::isValVtbl(v))
+            return false;
+        else if (!v->hasInitializer())
+        {
+            if(v->isExternalLinkage(v->getLinkage()))
+                return false;
+            else
+                return true;
+        }
+        else
+        {
+            StInfo *stInfo = LLVMModuleSet::getLLVMModuleSet()->getSVFType(v->getInitializer()->getType())->getTypeInfo();
+            const std::vector<const SVFType*> &fields = stInfo->getFlattenFieldTypes();
+            for (std::vector<const SVFType*>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
+            {
+                const SVFType* elemTy = *it;
+                assert(!SVFUtil::isa<SVFFunctionType>(elemTy) && "Initializer of a global is a function?");
+                if (SVFUtil::isa<SVFPointerType>(elemTy))
+                    return false;
+            }
+
+            return v->isConstant();
+        }
+    }
+    return LLVMUtil::isConstDataOrAggData(val);
+}
+
 namespace SVF
 {
 const std::string SVFValue::toString() const

package/lib/SVF-LLVM/SVFIRBuilder.cpp

@@ -223,7 +223,7 @@ void SVFIRBuilder::initialiseNodes()
     {
         DBOUT(DPAGBuild, outs() << "add address edges for constant node " << iter->second << "\n");
         const SVFValue* val = iter->first;
-        if (iter->second == pag->getSymbolInfo()->constantSymID())
+        if (isConstantObjSym(val))
         {
             NodeID ptr = pag->getValueNode(val);
             if(ptr!= pag->getBlkPtr() && ptr!= pag->getNullPtr())

package/lib/SVF-LLVM/SymbolTableBuilder.cpp

@@ -744,40 +744,6 @@ u32_t SymbolTableBuilder::getObjSize(const Type* ety)
     return numOfFields;
 }
 
-/*!
- * Check whether this value points-to a constant object
- */
-bool SymbolTableBuilder::isConstantObjSym(const Value* val)
-{
-    if (const GlobalVariable* v = SVFUtil::dyn_cast<GlobalVariable>(val))
-    {
-        if (cppUtil::isValVtbl(v))
-            return false;
-        else if (!v->hasInitializer())
-        {
-            if(v->isExternalLinkage(v->getLinkage()))
-                return false;
-            else
-                return true;
-        }
-        else
-        {
-            StInfo *stInfo = getOrAddSVFTypeInfo(v->getInitializer()->getType());
-            const std::vector<const SVFType*> &fields = stInfo->getFlattenFieldTypes();
-            for (std::vector<const SVFType*>::const_iterator it = fields.begin(), eit = fields.end(); it != eit; ++it)
-            {
-                const SVFType* elemTy = *it;
-                assert(!SVFUtil::isa<SVFFunctionType>(elemTy) && "Initializer of a global is a function?");
-                if (SVFUtil::isa<SVFPointerType>(elemTy))
-                    return false;
-            }
-
-            return v->isConstant();
-        }
-    }
-    return LLVMUtil::isConstDataOrAggData(val);
-}
-
 /// Number of flattenned elements of an array or struct
 u32_t SymbolTableBuilder::getNumOfFlattenElements(const Type* T)
 {

package/lib/SVFIR/SVFValue.cpp

@@ -155,7 +155,6 @@ bool SVFFunction::isVarArg() const
 SVFBasicBlock::SVFBasicBlock(const std::string& b, const SVFType* ty, const SVFFunction* f):
     SVFValue(b, ty, SVFValue::SVFBB), fun(f)
 {
-    name = hasName() ? getName(): "";
 }
 
 SVFBasicBlock::~SVFBasicBlock()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.596",
+  "version": "1.0.597",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {