svf-tools 1.0.874 → 1.0.875

package/svf/include/SVFIR/SVFType.h

@@ -31,100 +31,14 @@
 #define INCLUDE_SVFIR_SVFTYPE_H_
 
 #include "Util/SparseBitVector.h"
-#include <cstdint>
-#include <deque>
-#include <iostream>
-#include <list>
-#include <map>
-#include <set>
-#include <stack>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
+#include "Util/GeneralType.h"
+
 
 namespace SVF
 {
 class SVFType;
 class SVFPointerType;
 
-typedef std::ostream OutStream;
-typedef unsigned u32_t;
-typedef signed s32_t;
-typedef unsigned long long u64_t;
-typedef signed long long s64_t;
-
-typedef u32_t NodeID;
-typedef u32_t EdgeID;
-typedef unsigned SymID;
-typedef unsigned CallSiteID;
-typedef unsigned ThreadID;
-typedef s64_t APOffset;
-
-typedef SparseBitVector<> NodeBS;
-typedef unsigned PointsToID;
-
-/// provide extra hash function for std::pair handling
-template <class T> struct Hash;
-
-template <class S, class T> struct Hash<std::pair<S, T>>
-{
-    // Pairing function from: http://szudzik.com/ElegantPairing.pdf
-    static size_t szudzik(size_t a, size_t b)
-    {
-        return a > b ? b * b + a : a * a + a + b;
-    }
-
-    size_t operator()(const std::pair<S, T>& t) const
-    {
-        Hash<decltype(t.first)> first;
-        Hash<decltype(t.second)> second;
-        return szudzik(first(t.first), second(t.second));
-    }
-};
-
-template <class T> struct Hash
-{
-    size_t operator()(const T& t) const
-    {
-        std::hash<T> h;
-        return h(t);
-    }
-};
-
-template <typename Key, typename Hash = Hash<Key>,
-          typename KeyEqual = std::equal_to<Key>,
-          typename Allocator = std::allocator<Key> >
-using Set = std::unordered_set<Key, Hash, KeyEqual, Allocator>;
-
-template <typename Key, typename Value, typename Hash = Hash<Key>,
-          typename KeyEqual = std::equal_to<Key>,
-          typename Allocator = std::allocator<std::pair<const Key, Value> > >
-using Map = std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>;
-
-template <typename Key, typename Compare = std::less<Key>,
-          typename Allocator = std::allocator<Key> >
-using OrderedSet = std::set<Key, Compare, Allocator>;
-
-template <typename Key, typename Value, typename Compare = std::less<Key>,
-          typename Allocator = std::allocator<std::pair<const Key, Value> > >
-using OrderedMap = std::map<Key, Value, Compare, Allocator>;
-
-typedef std::pair<NodeID, NodeID> NodePair;
-typedef OrderedSet<NodeID> OrderedNodeSet;
-typedef Set<NodeID> NodeSet;
-typedef Set<NodePair> NodePairSet;
-typedef Map<NodePair, NodeID> NodePairMap;
-typedef std::vector<NodeID> NodeVector;
-typedef std::vector<EdgeID> EdgeVector;
-typedef std::stack<NodeID> NodeStack;
-typedef std::list<NodeID> NodeList;
-typedef std::deque<NodeID> NodeDeque;
-typedef NodeSet EdgeSet;
-typedef std::vector<u32_t> CallStrCxt;
-typedef unsigned Version;
-typedef Set<Version> VersionSet;
-typedef std::pair<NodeID, Version> VersionedVar;
-typedef Set<VersionedVar> VersionedVarSet;
 
 /*!
  * Flattened type information of StructType, ArrayType and SingleValueType

package/svf/include/Util/CFBasicBlockGBuilder.h

@@ -41,6 +41,11 @@ private:
 public:
     CFBasicBlockGBuilder() : _CFBasicBlockG() {}
 
+    ~CFBasicBlockGBuilder()
+    {
+        delete _CFBasicBlockG;
+    }
+
     virtual void build(ICFG* icfg);
 
     inline CFBasicBlockGraph* getCFBasicBlockGraph()

package/svf/include/Util/GeneralType.h

@@ -0,0 +1,123 @@
+//===- GeneralType.h -- Primitive types used in SVF--------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013->  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * GeneralType.h
+ *
+ *  Created on: Feb 8, 2024
+ *      Author: Jiawei Wang
+ */
+
+#pragma once
+#include <cstdint>
+#include <deque>
+#include <iostream>
+#include <list>
+#include <map>
+#include <set>
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+#include "Util/SparseBitVector.h"
+
+namespace SVF
+{
+typedef std::ostream OutStream;
+typedef unsigned u32_t;
+typedef signed s32_t;
+typedef unsigned long long u64_t;
+typedef signed long long s64_t;
+
+typedef u32_t NodeID;
+typedef u32_t EdgeID;
+typedef unsigned SymID;
+typedef unsigned CallSiteID;
+typedef unsigned ThreadID;
+typedef s64_t APOffset;
+
+typedef SparseBitVector<> NodeBS;
+typedef unsigned PointsToID;
+
+/// provide extra hash function for std::pair handling
+template <class T> struct Hash;
+
+template <class S, class T> struct Hash<std::pair<S, T>>
+{
+    // Pairing function from: http://szudzik.com/ElegantPairing.pdf
+    static size_t szudzik(size_t a, size_t b)
+    {
+        return a > b ? b * b + a : a * a + a + b;
+    }
+
+    size_t operator()(const std::pair<S, T>& t) const
+    {
+        Hash<decltype(t.first)> first;
+        Hash<decltype(t.second)> second;
+        return szudzik(first(t.first), second(t.second));
+    }
+};
+
+template <class T> struct Hash
+{
+    size_t operator()(const T& t) const
+    {
+        std::hash<T> h;
+        return h(t);
+    }
+};
+
+template <typename Key, typename Hash = Hash<Key>,
+          typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = std::allocator<Key>>
+using Set = std::unordered_set<Key, Hash, KeyEqual, Allocator>;
+
+template <typename Key, typename Value, typename Hash = Hash<Key>,
+          typename KeyEqual = std::equal_to<Key>,
+          typename Allocator = std::allocator<std::pair<const Key, Value>>>
+                  using Map = std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>;
+
+          template <typename Key, typename Compare = std::less<Key>,
+                    typename Allocator = std::allocator<Key>>
+          using OrderedSet = std::set<Key, Compare, Allocator>;
+
+          template <typename Key, typename Value, typename Compare = std::less<Key>,
+                    typename Allocator = std::allocator<std::pair<const Key, Value>>>
+                            using OrderedMap = std::map<Key, Value, Compare, Allocator>;
+
+                    typedef std::pair<NodeID, NodeID> NodePair;
+                    typedef OrderedSet<NodeID> OrderedNodeSet;
+                    typedef Set<NodeID> NodeSet;
+                    typedef Set<NodePair> NodePairSet;
+                    typedef Map<NodePair, NodeID> NodePairMap;
+                    typedef std::vector<NodeID> NodeVector;
+                    typedef std::vector<EdgeID> EdgeVector;
+                    typedef std::stack<NodeID> NodeStack;
+                    typedef std::list<NodeID> NodeList;
+                    typedef std::deque<NodeID> NodeDeque;
+                    typedef NodeSet EdgeSet;
+                    typedef std::vector<u32_t> CallStrCxt;
+                    typedef unsigned Version;
+                    typedef Set<Version> VersionSet;
+                    typedef std::pair<NodeID, Version> VersionedVar;
+                    typedef Set<VersionedVar> VersionedVarSet;
+}

package/svf/include/Util/Options.h

@@ -261,6 +261,17 @@ public:
     static const Option<bool> LoopAnalysis;
     static const Option<u32_t> LoopBound;
 
+    // Abstract Execution
+    static const Option<u32_t> WidenDelay;
+    /// the max time consumptions (seconds). Default: 4 hours 14400s
+    static const Option<u32_t> Timeout;
+    /// bug info output file, Default: output.db
+    static const Option<std::string> OutputName;
+    /// open buffer overflow checker, Default: false
+    static const Option<bool> BufferOverflowCheck;
+    /// if the access index of gepstmt is unknown, skip it, Default: false
+    static const Option<bool> GepUnknownIdx;
+    static const Option<bool> RunUncallFuncs;
 };
 }  // namespace SVF
 

package/svf/lib/{AbstractExecution → AE/Core}/BoundedZ3Expr.cpp

@@ -26,7 +26,7 @@
  *      Author: Xiao Cheng
  *
  */
-#include "AbstractExecution/BoundedZ3Expr.h"
+#include "AE/Core/BoundedZ3Expr.h"
 #include "Util/Options.h"
 
 using namespace SVF;

package/svf/lib/{AbstractExecution → AE/Core}/ConsExeState.cpp

@@ -24,12 +24,9 @@
 // Created by jiawei and xiao on 6/1/23.
 //
 
-
-
-#include "AbstractExecution/ConsExeState.h"
-#include <iomanip>
+#include "AE/Core/ConsExeState.h"
 #include "Util/Options.h"
-
+#include <iomanip>
 
 using namespace SVF;
 using namespace SVFUtil;

package/svf/lib/{AbstractExecution → AE/Core}/ExeState.cpp

@@ -27,8 +27,8 @@
  *
  */
 
-#include "AbstractExecution/ExeState.h"
-#include "AbstractExecution/IntervalExeState.h"
+#include "AE/Core/ExeState.h"
+#include "AE/Core/IntervalExeState.h"
 
 using namespace SVF;
 

package/svf/lib/{AbstractExecution → AE/Core}/IntervalExeState.cpp

@@ -27,7 +27,7 @@
  *
  */
 
-#include "AbstractExecution/IntervalExeState.h"
+#include "AE/Core/IntervalExeState.h"
 #include "Util/SVFUtil.h"
 
 using namespace SVF;

package/svf/lib/{AbstractExecution → AE/Core}/RelExeState.cpp

@@ -27,8 +27,9 @@
  *
  */
 
-#include "AbstractExecution/RelExeState.h"
-#include "SVFIR/SVFIR.h"
+#include "AE/Core/RelExeState.h"
+#include "Util/GeneralType.h"
+#include "Util/SVFUtil.h"
 #include <iomanip>
 
 using namespace SVF;

package/svf/lib/{AbstractExecution → AE/Core}/RelationSolver.cpp

@@ -26,7 +26,7 @@
  *      Author: Jiawei Ren
  *
  */
-#include "AbstractExecution/RelationSolver.h"
+#include "AE/Core/RelationSolver.h"
 using namespace SVF;
 using namespace SVFUtil;
 

package/svf/lib/{AbstractExecution → AE/Core}/SVFIR2Relation.cpp

@@ -2,7 +2,7 @@
 // Created by Xiao on 2022/8/18.
 //
 
-#include "AbstractExecution/SVFIR2ItvExeState.h"
+#include "AE/Svfexe/SVFIR2ItvExeState.h"
 
 using namespace SVF;
 using namespace SVFUtil;

package/svf/lib/{AbstractExecution → AE/Core}/SymState.cpp

@@ -25,7 +25,7 @@
 //
 
 
-#include "AbstractExecution/SymState.h"
+#include "AE/Core/SymState.h"
 
 using namespace SVF;