svf-lib 1.0.2643 → 1.0.2655

package/SVF-linux-x86_64/include/WPA/TypeAnalysis.h

@@ -30,11 +30,16 @@
 #ifndef INCLUDE_WPA_TYPEANALYSIS_H_
 #define INCLUDE_WPA_TYPEANALYSIS_H_
 
+#include "Util/GeneralType.h"
 #include "WPA/Andersen.h"
 
 namespace SVF
 {
 
+class CallEdgeMap;
+class CallSiteToFunPtrMap;
+class SVFIR;
+
 class TypeAnalysis:  public AndersenBase
 {
 

package/SVF-linux-x86_64/include/WPA/VersionedFlowSensitive.h

@@ -14,12 +14,9 @@
 #ifndef VFS_H_
 #define VFS_H_
 
-#include "Graphs/SVFGOPT.h"
-#include "MSSA/SVFGBuilder.h"
+#include "Graphs/SVFG.h"
 #include "WPA/FlowSensitive.h"
-#include "WPA/WPAFSSolver.h"
 #include "MemoryModel/PTATY.h"
-#include "MemoryModel/PointsTo.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/WPA/WPAFSSolver.h

@@ -37,6 +37,7 @@
 #define WPAFSSOLVER_H_
 
 #include "WPA/WPASolver.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/WPA/WPAPass.h

@@ -37,11 +37,15 @@
 #ifndef WPA_H_
 #define WPA_H_
 
-#include "MemoryModel/PointerAnalysisImpl.h"
+#include "Util/GeneralType.h"
+#include "SVFIR/SVFType.h"
 
 namespace SVF
 {
 
+class CallICFGNode;
+class PointerAnalysis;
+class PointsTo;
 class SVFG;
 
 /*!

package/SVF-linux-x86_64/include/WPA/WPASolver.h

@@ -32,6 +32,7 @@
 #define GRAPHSOLVER_H_
 
 #include "Util/WorkList.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/WPA/WPAStat.h

@@ -34,6 +34,7 @@
 #include "Util/PTAStat.h"
 #include "WPA/FlowSensitive.h"
 #include "WPA/VersionedFlowSensitive.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/lib/cmake/SVF/SVFTargets.cmake

@@ -81,7 +81,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.23.0")
       FILE_SET "HEADERS"
       TYPE "HEADERS"
       BASE_DIRS "${_IMPORT_PREFIX}/include"
-      FILES "${_IMPORT_PREFIX}/include/AE/Core/AbstractState.h" "${_IMPORT_PREFIX}/include/AE/Core/AbstractValue.h" "${_IMPORT_PREFIX}/include/AE/Core/AddressValue.h" "${_IMPORT_PREFIX}/include/AE/Core/ICFGWTO.h" "${_IMPORT_PREFIX}/include/AE/Core/IntervalValue.h" "${_IMPORT_PREFIX}/include/AE/Core/NumericValue.h" "${_IMPORT_PREFIX}/include/AE/Core/RelExeState.h" "${_IMPORT_PREFIX}/include/AE/Core/RelationSolver.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEDetector.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEStat.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEWTO.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbsExtAPI.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbstractInterpretation.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/SparseAbstractInterpretation.h" "${_IMPORT_PREFIX}/include/CFL/CFGNormalizer.h" "${_IMPORT_PREFIX}/include/CFL/CFGrammar.h" "${_IMPORT_PREFIX}/include/CFL/CFLAlias.h" "${_IMPORT_PREFIX}/include/CFL/CFLBase.h" "${_IMPORT_PREFIX}/include/CFL/CFLGramGraphChecker.h" "${_IMPORT_PREFIX}/include/CFL/CFLGraphBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSVFGBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSolver.h" "${_IMPORT_PREFIX}/include/CFL/CFLStat.h" "${_IMPORT_PREFIX}/include/CFL/CFLVF.h" "${_IMPORT_PREFIX}/include/CFL/GrammarBuilder.h" "${_IMPORT_PREFIX}/include/DDA/ContextDDA.h" "${_IMPORT_PREFIX}/include/DDA/DDAClient.h" "${_IMPORT_PREFIX}/include/DDA/DDAPass.h" "${_IMPORT_PREFIX}/include/DDA/DDAStat.h" "${_IMPORT_PREFIX}/include/DDA/DDAVFSolver.h" "${_IMPORT_PREFIX}/include/DDA/FlowDDA.h" "${_IMPORT_PREFIX}/include/FastCluster/fastcluster.h" "${_IMPORT_PREFIX}/include/Graphs/BasicBlockG.h" "${_IMPORT_PREFIX}/include/Graphs/CDG.h" "${_IMPORT_PREFIX}/include/Graphs/CFLGraph.h" "${_IMPORT_PREFIX}/include/Graphs/CHG.h" "${_IMPORT_PREFIX}/include/Graphs/CallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/ConsG.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGNode.h" "${_IMPORT_PREFIX}/include/Graphs/DOTGraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GenericGraph.h" "${_IMPORT_PREFIX}/include/Graphs/GraphPrinter.h" "${_IMPORT_PREFIX}/include/Graphs/GraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GraphWriter.h" "${_IMPORT_PREFIX}/include/Graphs/ICFG.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/IRGraph.h" "${_IMPORT_PREFIX}/include/Graphs/SCC.h" "${_IMPORT_PREFIX}/include/Graphs/SVFG.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGOPT.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/ThreadCallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/VFG.h" "${_IMPORT_PREFIX}/include/Graphs/VFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/VFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/WTO.h" "${_IMPORT_PREFIX}/include/MSSA/MSSAMuChi.h" "${_IMPORT_PREFIX}/include/MSSA/MemPartition.h" "${_IMPORT_PREFIX}/include/MSSA/MemRegion.h" "${_IMPORT_PREFIX}/include/MSSA/MemSSA.h" "${_IMPORT_PREFIX}/include/MSSA/SVFGBuilder.h" "${_IMPORT_PREFIX}/include/MTA/LockAnalysis.h" "${_IMPORT_PREFIX}/include/MTA/MHP.h" "${_IMPORT_PREFIX}/include/MTA/MTA.h" "${_IMPORT_PREFIX}/include/MTA/MTAStat.h" "${_IMPORT_PREFIX}/include/MTA/TCT.h" "${_IMPORT_PREFIX}/include/MemoryModel/AbstractPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/AccessPath.h" "${_IMPORT_PREFIX}/include/MemoryModel/ConditionalPT.h" "${_IMPORT_PREFIX}/include/MemoryModel/MutablePointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PTATY.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToCache.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysis.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysisImpl.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointsTo.h" "${_IMPORT_PREFIX}/include/MemoryModel/SVFLoop.h" "${_IMPORT_PREFIX}/include/SABER/DoubleFreeChecker.h" "${_IMPORT_PREFIX}/include/SABER/FileChecker.h" "${_IMPORT_PREFIX}/include/SABER/LeakChecker.h" "${_IMPORT_PREFIX}/include/SABER/ProgSlice.h" "${_IMPORT_PREFIX}/include/SABER/SaberCheckerAPI.h" "${_IMPORT_PREFIX}/include/SABER/SaberCondAllocator.h" "${_IMPORT_PREFIX}/include/SABER/SaberSVFGBuilder.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkDDA.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkSolver.h" "${_IMPORT_PREFIX}/include/SVFIR/ObjTypeInfo.h" "${_IMPORT_PREFIX}/include/SVFIR/PAGBuilderFromFile.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFIR.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFStatements.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFType.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFValue.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFVariables.h" "${_IMPORT_PREFIX}/include/Util/Annotator.h" "${_IMPORT_PREFIX}/include/Util/BitVector.h" "${_IMPORT_PREFIX}/include/Util/CDGBuilder.h" "${_IMPORT_PREFIX}/include/Util/CallGraphBuilder.h" "${_IMPORT_PREFIX}/include/Util/Casting.h" "${_IMPORT_PREFIX}/include/Util/CommandLine.h" "${_IMPORT_PREFIX}/include/Util/CoreBitVector.h" "${_IMPORT_PREFIX}/include/Util/CxtStmt.h" "${_IMPORT_PREFIX}/include/Util/DPItem.h" "${_IMPORT_PREFIX}/include/Util/ExtAPI.h" "${_IMPORT_PREFIX}/include/Util/GeneralType.h" "${_IMPORT_PREFIX}/include/Util/GraphReachSolver.h" "${_IMPORT_PREFIX}/include/Util/NodeIDAllocator.h" "${_IMPORT_PREFIX}/include/Util/Options.h" "${_IMPORT_PREFIX}/include/Util/PTAStat.h" "${_IMPORT_PREFIX}/include/Util/SVFBugReport.h" "${_IMPORT_PREFIX}/include/Util/SVFLoopAndDomInfo.h" "${_IMPORT_PREFIX}/include/Util/SVFStat.h" "${_IMPORT_PREFIX}/include/Util/SVFUtil.h" "${_IMPORT_PREFIX}/include/Util/SparseBitVector.h" "${_IMPORT_PREFIX}/include/Util/ThreadAPI.h" "${_IMPORT_PREFIX}/include/Util/WorkList.h" "${_IMPORT_PREFIX}/include/Util/Z3Expr.h" "${_IMPORT_PREFIX}/include/Util/cJSON.h" "${_IMPORT_PREFIX}/include/Util/iterator.h" "${_IMPORT_PREFIX}/include/Util/iterator_range.h" "${_IMPORT_PREFIX}/include/WPA/Andersen.h" "${_IMPORT_PREFIX}/include/WPA/AndersenPWC.h" "${_IMPORT_PREFIX}/include/WPA/CSC.h" "${_IMPORT_PREFIX}/include/WPA/FlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/Steensgaard.h" "${_IMPORT_PREFIX}/include/WPA/TypeAnalysis.h" "${_IMPORT_PREFIX}/include/WPA/VersionedFlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/WPAFSSolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAPass.h" "${_IMPORT_PREFIX}/include/WPA/WPASolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAStat.h"
+      FILES "${_IMPORT_PREFIX}/include/AE/Core/AbstractState.h" "${_IMPORT_PREFIX}/include/AE/Core/AbstractValue.h" "${_IMPORT_PREFIX}/include/AE/Core/AddressValue.h" "${_IMPORT_PREFIX}/include/AE/Core/ICFGWTO.h" "${_IMPORT_PREFIX}/include/AE/Core/IntervalValue.h" "${_IMPORT_PREFIX}/include/AE/Core/NumericValue.h" "${_IMPORT_PREFIX}/include/AE/Core/RelExeState.h" "${_IMPORT_PREFIX}/include/AE/Core/RelationSolver.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEDetector.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEStat.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEWTO.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbsExtAPI.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbstractInterpretation.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/SparseAbstractInterpretation.h" "${_IMPORT_PREFIX}/include/CFL/CFGNormalizer.h" "${_IMPORT_PREFIX}/include/CFL/CFGrammar.h" "${_IMPORT_PREFIX}/include/CFL/CFLAlias.h" "${_IMPORT_PREFIX}/include/CFL/CFLBase.h" "${_IMPORT_PREFIX}/include/CFL/CFLGramGraphChecker.h" "${_IMPORT_PREFIX}/include/CFL/CFLGraphBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSVFGBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSolver.h" "${_IMPORT_PREFIX}/include/CFL/CFLStat.h" "${_IMPORT_PREFIX}/include/CFL/CFLVF.h" "${_IMPORT_PREFIX}/include/CFL/GrammarBuilder.h" "${_IMPORT_PREFIX}/include/DDA/ContextDDA.h" "${_IMPORT_PREFIX}/include/DDA/DDAClient.h" "${_IMPORT_PREFIX}/include/DDA/DDAPass.h" "${_IMPORT_PREFIX}/include/DDA/DDAStat.h" "${_IMPORT_PREFIX}/include/DDA/DDAVFSolver.h" "${_IMPORT_PREFIX}/include/DDA/FlowDDA.h" "${_IMPORT_PREFIX}/include/FastCluster/fastcluster.h" "${_IMPORT_PREFIX}/include/Graphs/BasicBlockG.h" "${_IMPORT_PREFIX}/include/Graphs/CDG.h" "${_IMPORT_PREFIX}/include/Graphs/CFLGraph.h" "${_IMPORT_PREFIX}/include/Graphs/CHG.h" "${_IMPORT_PREFIX}/include/Graphs/CallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/ConsG.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGNode.h" "${_IMPORT_PREFIX}/include/Graphs/DOTGraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GenericGraph.h" "${_IMPORT_PREFIX}/include/Graphs/GraphPrinter.h" "${_IMPORT_PREFIX}/include/Graphs/GraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GraphWriter.h" "${_IMPORT_PREFIX}/include/Graphs/ICFG.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/IRGraph.h" "${_IMPORT_PREFIX}/include/Graphs/SCC.h" "${_IMPORT_PREFIX}/include/Graphs/SVFG.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGOPT.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/ThreadCallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/VFG.h" "${_IMPORT_PREFIX}/include/Graphs/VFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/VFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/WTO.h" "${_IMPORT_PREFIX}/include/MSSA/MSSAMuChi.h" "${_IMPORT_PREFIX}/include/MSSA/MemPartition.h" "${_IMPORT_PREFIX}/include/MSSA/MemRegion.h" "${_IMPORT_PREFIX}/include/MSSA/MemSSA.h" "${_IMPORT_PREFIX}/include/MSSA/SVFGBuilder.h" "${_IMPORT_PREFIX}/include/MTA/LockAnalysis.h" "${_IMPORT_PREFIX}/include/MTA/MHP.h" "${_IMPORT_PREFIX}/include/MTA/MTA.h" "${_IMPORT_PREFIX}/include/MTA/MTAStat.h" "${_IMPORT_PREFIX}/include/MTA/TCT.h" "${_IMPORT_PREFIX}/include/MemoryModel/AbstractPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/AccessPath.h" "${_IMPORT_PREFIX}/include/MemoryModel/ConditionalPT.h" "${_IMPORT_PREFIX}/include/MemoryModel/MutablePointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PTATY.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToCache.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysis.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysisImpl.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointsTo.h" "${_IMPORT_PREFIX}/include/MemoryModel/SVFLoop.h" "${_IMPORT_PREFIX}/include/SABER/DoubleFreeChecker.h" "${_IMPORT_PREFIX}/include/SABER/FileChecker.h" "${_IMPORT_PREFIX}/include/SABER/LeakChecker.h" "${_IMPORT_PREFIX}/include/SABER/ProgSlice.h" "${_IMPORT_PREFIX}/include/SABER/SaberCheckerAPI.h" "${_IMPORT_PREFIX}/include/SABER/SaberCondAllocator.h" "${_IMPORT_PREFIX}/include/SABER/SaberSVFGBuilder.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkDDA.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkSolver.h" "${_IMPORT_PREFIX}/include/SVFIR/ObjTypeInfo.h" "${_IMPORT_PREFIX}/include/SVFIR/PAGBuilderFromFile.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFIR.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFStatements.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFType.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFValue.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFVariables.h" "${_IMPORT_PREFIX}/include/Util/Annotator.h" "${_IMPORT_PREFIX}/include/Util/BitVector.h" "${_IMPORT_PREFIX}/include/Util/CDGBuilder.h" "${_IMPORT_PREFIX}/include/Util/CallGraphBuilder.h" "${_IMPORT_PREFIX}/include/Util/Casting.h" "${_IMPORT_PREFIX}/include/Util/CommandLine.h" "${_IMPORT_PREFIX}/include/Util/CoreBitVector.h" "${_IMPORT_PREFIX}/include/Util/CxtStmt.h" "${_IMPORT_PREFIX}/include/Util/DPItem.h" "${_IMPORT_PREFIX}/include/Util/ExtAPI.h" "${_IMPORT_PREFIX}/include/Util/GeneralType.h" "${_IMPORT_PREFIX}/include/Util/GraphReachSolver.h" "${_IMPORT_PREFIX}/include/Util/Hash.h" "${_IMPORT_PREFIX}/include/Util/NodeIDAllocator.h" "${_IMPORT_PREFIX}/include/Util/Options.h" "${_IMPORT_PREFIX}/include/Util/PTAStat.h" "${_IMPORT_PREFIX}/include/Util/SVFBugReport.h" "${_IMPORT_PREFIX}/include/Util/SVFLoopAndDomInfo.h" "${_IMPORT_PREFIX}/include/Util/SVFStat.h" "${_IMPORT_PREFIX}/include/Util/SVFUtil.h" "${_IMPORT_PREFIX}/include/Util/SparseBitVector.h" "${_IMPORT_PREFIX}/include/Util/ThreadAPI.h" "${_IMPORT_PREFIX}/include/Util/WorkList.h" "${_IMPORT_PREFIX}/include/Util/Z3Expr.h" "${_IMPORT_PREFIX}/include/Util/cJSON.h" "${_IMPORT_PREFIX}/include/Util/iterator.h" "${_IMPORT_PREFIX}/include/Util/iterator_range.h" "${_IMPORT_PREFIX}/include/WPA/Andersen.h" "${_IMPORT_PREFIX}/include/WPA/AndersenPWC.h" "${_IMPORT_PREFIX}/include/WPA/CSC.h" "${_IMPORT_PREFIX}/include/WPA/FlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/Steensgaard.h" "${_IMPORT_PREFIX}/include/WPA/TypeAnalysis.h" "${_IMPORT_PREFIX}/include/WPA/VersionedFlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/WPAFSSolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAPass.h" "${_IMPORT_PREFIX}/include/WPA/WPASolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAStat.h"
   )
 else()
   set_property(TARGET SVF::SvfCore

package/SVF-osx/include/AE/Core/AbstractState.h

@@ -48,7 +48,7 @@
 
 #include "AE/Core/AbstractValue.h"
 #include "AE/Core/IntervalValue.h"
-#include "SVFIR/SVFVariables.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/AE/Core/ICFGWTO.h

@@ -34,13 +34,16 @@
 #ifndef SVF_ICFGWTO_H
 #define SVF_ICFGWTO_H
 
+#include <vector>
+
 #include "Graphs/ICFG.h"
 #include "Graphs/WTO.h"
-#include "Graphs/CallGraph.h"
 
 namespace SVF
 {
 
+class FunObjVar;
+
 typedef WTOComponent<ICFG> ICFGWTOComp;
 typedef WTONode<ICFG> ICFGSingletonWTO;
 typedef WTOCycle<ICFG> ICFGCycleWTO;

package/SVF-osx/include/AE/Core/NumericValue.h

@@ -33,11 +33,12 @@
 #ifndef SVF_NUMERICVALUE_H
 #define SVF_NUMERICVALUE_H
 
-#include "SVFIR/SVFType.h"
 #include <cfloat> // For DBL_MAX
 #include <cmath>
 #include <utility>
 
+#include "Util/GeneralType.h"
+
 #define epsilon std::numeric_limits<double>::epsilon();
 namespace SVF
 {

package/SVF-osx/include/AE/Core/RelExeState.h

@@ -32,6 +32,7 @@
 
 #include "AE/Core/AddressValue.h"
 #include "Util/Z3Expr.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/AE/Core/RelationSolver.h

@@ -30,11 +30,15 @@
 #ifndef Z3_EXAMPLE_RELATIONSOLVER_H
 #define Z3_EXAMPLE_RELATIONSOLVER_H
 
-#include "AE/Core/AbstractState.h"
+#include "AE/Core/NumericValue.h"
 #include "Util/Z3Expr.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
+
+class AbstractState;
+
 class RelationSolver
 {
 public:

package/SVF-osx/include/AE/Svfexe/AbsExtAPI.h

@@ -25,15 +25,21 @@
 //      Author: Xiao Cheng, Jiawei Wang
 //
 #pragma once
+
+#include <functional>
+
 #include "AE/Core/AbstractState.h"
-#include "AE/Core/ICFGWTO.h"
-#include "AE/Svfexe/AEDetector.h"
-#include "Util/SVFBugReport.h"
+#include "AE/Core/IntervalValue.h"
+#include "SVFIR/SVFIR.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
 class AbstractInterpretation;
+class AbstractState;
+class CallICFGNode;
+class ICFGNode;
 
 /**
  * @class AbsExtAPI

package/SVF-osx/include/AE/Svfexe/SparseAbstractInterpretation.h

@@ -23,9 +23,11 @@
 #ifndef INCLUDE_AE_SVFEXE_SPARSEABSTRACTINTERPRETATION_H_
 #define INCLUDE_AE_SVFEXE_SPARSEABSTRACTINTERPRETATION_H_
 
-#include "AE/Svfexe/AbstractInterpretation.h"
 #include <memory>
 
+#include "AE/Svfexe/AbstractInterpretation.h"
+#include "MSSA/SVFGBuilder.h"
+
 namespace SVF
 {
 

package/SVF-osx/include/CFL/CFGNormalizer.h

@@ -31,6 +31,7 @@
 #define INCLUDE_CFL_CFGNORMALIZER_H_
 
 #include "CFGrammar.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
@@ -81,4 +82,4 @@ private:
 
 } // End namespace SVF
 
-#endif /* INCLUDE_CFL_CFGNORMALIZER_H_*/
+#endif /* INCLUDE_CFL_CFGNORMALIZER_H_*/

package/SVF-osx/include/CFL/CFGrammar.h

@@ -28,7 +28,11 @@
  */
 #ifndef CFLGrammar_H_
 #define CFLGrammar_H_
-#include "SVFIR/SVFType.h"
+
+#include <deque>
+#include <vector>
+
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
@@ -147,11 +151,11 @@ public:
     template<typename Key, typename Value, typename Hash = SymbolHash,
              typename KeyEqual = std::equal_to<Key>,
              typename Allocator = std::allocator<std::pair<const Key, Value>>>
-    using SymbolMap = std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>;
+    using SymbolMap = Map<Key, Value, Hash, KeyEqual, Allocator>;
 
     template <typename Key, typename Hash = SymbolVectorHash, typename KeyEqual = std::equal_to<Key>,
               typename Allocator = std::allocator<Key>>
-    using SymbolSet = std::unordered_set<Key, Hash, KeyEqual, Allocator>;
+    using SymbolSet = Set<Key, Hash, KeyEqual, Allocator>;
 
     typedef std::vector<Symbol> Production;
     typedef SymbolSet<Production> Productions;
@@ -465,4 +469,4 @@ private:
 };
 
 }
-#endif /* CFLGrammar_H_ */
+#endif /* CFLGrammar_H_ */

package/SVF-osx/include/CFL/CFLAlias.h

@@ -32,12 +32,13 @@
 
 #include "CFL/CFLBase.h"
 #include "CFL/CFLStat.h"
+#include "MemoryModel/PTATY.h"
+#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
-class CFLStat;
-
 class CFLAlias : public CFLBase
 {
 

package/SVF-osx/include/CFL/CFLBase.h

@@ -31,21 +31,16 @@
 #define INCLUDE_CFL_CFLBASE_H_
 
 #include "CFL/CFLSolver.h"
-#include "CFL/CFGNormalizer.h"
-#include "CFL/GrammarBuilder.h"
-#include "CFL/CFLGraphBuilder.h"
-#include "CFL/CFLGramGraphChecker.h"
-#include "MemoryModel/PointerAnalysis.h"
+#include "CFL/CFGrammar.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
-#include "Graphs/ConsG.h"
-#include "Util/Options.h"
-#include "Util/PTAStat.h"
-#include "SVFIR/SVFType.h"
+#include "MemoryModel/PTATY.h"
 
 namespace SVF
 {
 
+class CFLGraph;
 class CFLStat;
+class SVFIR;
 
 /// CFL Client Base Class
 class CFLBase : public BVDataPTAImpl

package/SVF-osx/include/CFL/CFLGramGraphChecker.h

@@ -30,7 +30,9 @@
 #define INCLUDE_CFL_CFLGRAMGRAPHCHECKER_H_
 
 #include "CFL/CFGrammar.h"
+#include "CFL/CFLGraphBuilder.h"
 #include "Graphs/CFLGraph.h"
+
 namespace SVF
 {
 
@@ -71,4 +73,4 @@ public:
 
 }// SVF
 
-#endif /* INCLUDE_CFL_CFLGRAMGRAPHCHECKER_H_*/
+#endif /* INCLUDE_CFL_CFLGRAMGRAPHCHECKER_H_*/

package/SVF-osx/include/CFL/CFLGraphBuilder.h

@@ -33,6 +33,7 @@
 #include "CFL/CFGrammar.h"
 #include "Graphs/CFLGraph.h"
 #include "Graphs/SVFG.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/CFL/CFLSVFGBuilder.h

@@ -27,11 +27,16 @@
 #ifndef SVF_CFLSVFGBUILDER_H
 #define SVF_CFLSVFGBUILDER_H
 
+#include "Graphs/SVFG.h"
 #include "SABER/SaberSVFGBuilder.h"
+#include "Util/WorkList.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class BVDataPTAImpl;
+
 class CFLSVFGBuilder: public SaberSVFGBuilder
 {
 public:

package/SVF-osx/include/CFL/CFLSolver.h

@@ -32,6 +32,7 @@
 
 #include "Graphs/CFLGraph.h"
 #include "CFL/CFGrammar.h"
+#include "Util/GeneralType.h"
 #include "Util/WorkList.h"
 
 using namespace std;
@@ -371,4 +372,4 @@ public:
 };
 }
 
-#endif /* INCLUDE_CFL_CFLSolver_H_*/
+#endif /* INCLUDE_CFL_CFLSolver_H_*/

package/SVF-osx/include/CFL/CFLStat.h

@@ -32,12 +32,12 @@
 #define CFL_CFLSTAT_H_
 
 #include "Util/PTAStat.h"
-#include "CFL/CFLAlias.h"
-#include "CFL/CFLVF.h"
 
 namespace SVF
 {
 
+class CFLBase;
+
 /*!
  * Statistics of CFL's analysis
  */

package/SVF-osx/include/CFL/CFLVF.h

@@ -32,12 +32,15 @@
 
 
 #include "CFL/CFLBase.h"
-#include "CFL/CFLStat.h"
 #include "CFL/CFLSVFGBuilder.h"
-#include "WPA/Andersen.h"
+#include "Graphs/SVFG.h"
+#include "MemoryModel/PTATY.h"
 
 namespace SVF
 {
+
+class SVFIR;
+
 class CFLVF : public CFLBase
 {
 

package/SVF-osx/include/CFL/GrammarBuilder.h

@@ -30,11 +30,13 @@
 #ifndef INCLUDE_CFL_GRAMMARBUILDER_H_
 #define INCLUDE_CFL_GRAMMARBUILDER_H_
 
-#include "CFL/CFGrammar.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class GrammarBase;
+
 /**
  * Build Grammar from a user specified grammar text
  *

package/SVF-osx/include/DDA/ContextDDA.h

@@ -40,6 +40,7 @@
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "DDA/DDAVFSolver.h"
 #include "Util/DPItem.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/DDA/DDAClient.h

@@ -35,13 +35,13 @@
 #define DDACLIENT_H_
 
 #include "SVFIR/SVFIR.h"
-#include "MemoryModel/PointerAnalysisImpl.h"
 #include "Graphs/SVFG.h"
-#include "SVFIR/SVFValue.h"
 
 namespace SVF
 {
 
+class PointerAnalysis;
+
 /**
  * General DDAClient which queries all top level pointers by default.
  */

package/SVF-osx/include/DDA/DDAPass.h

@@ -33,12 +33,16 @@
 #define DDAPASS_H_
 
 #include "DDA/DDAClient.h"
+#include "MemoryModel/PointerAnalysis.h"
 #include "Graphs/SCC.h"
-#include "MemoryModel/PointerAnalysisImpl.h"
+#include "Graphs/SVFG.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class PointerAnalysis;
+
 /*!
  * Demand-Driven Pointer Analysis.
  * This class performs various pointer analysis on the given module.

package/SVF-osx/include/DDA/DDAStat.h

@@ -30,8 +30,9 @@
 #ifndef DDASTAT_H_
 #define DDASTAT_H_
 
-#include "Util/PTAStat.h"
 #include "MemoryModel/PointsTo.h"
+#include "Util/PTAStat.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/DDA/DDAVFSolver.h

@@ -30,12 +30,14 @@
 #ifndef VALUEFLOWDDA_H_
 #define VALUEFLOWDDA_H_
 
+#include <algorithm>
+
 #include "DDA/DDAStat.h"
 #include "Graphs/SCC.h"
 #include "MSSA/SVFGBuilder.h"
 #include "MemoryModel/PointsTo.h"
 #include "WPA/Andersen.h"
-#include <algorithm>
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/DDA/FlowDDA.h

@@ -38,8 +38,9 @@
 #define FlowDDA_H_
 
 #include "MemoryModel/PointerAnalysisImpl.h"
-#include "Util/DPItem.h"
 #include "DDA/DDAVFSolver.h"
+#include "Util/DPItem.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-osx/include/Graphs/CDG.h

@@ -30,12 +30,18 @@
 #ifndef SVF_CONTROLDG_H
 #define SVF_CONTROLDG_H
 
+#include "Graphs/GenericGraph.h"
+#include "Graphs/GraphPrinter.h"
+#include "Graphs/ICFGNode.h"
 #include "SVFIR/SVFIR.h"
+#include "Util/GeneralType.h"
+#include "Util/SVFUtil.h"
 
 namespace SVF
 {
 
 class CDGNode;
+class SVFVar;
 
 typedef GenericEdge<CDGNode> GenericCDGEdgeTy;
 

package/SVF-osx/include/Graphs/ICFGNode.h

@@ -31,6 +31,7 @@
 #define ICFGNODE_H_
 
 #include "Util/SVFUtil.h"
+#include "Graphs/BasicBlockG.h"
 #include "Graphs/GenericGraph.h"
 #include "Graphs/ICFGEdge.h"
 

package/SVF-osx/include/Graphs/IRGraph.h

@@ -31,17 +31,16 @@
 #ifndef IRGRAPH_H_
 #define IRGRAPH_H_
 
+#include "Graphs/GenericGraph.h"
 #include "SVFIR/SVFStatements.h"
 #include "SVFIR/SVFVariables.h"
-#include "Util/NodeIDAllocator.h"
-#include "Util/SVFUtil.h"
-#include "Graphs/ICFG.h"
 
 namespace SVF
 {
 typedef SVFVar PAGNode;
 typedef SVFStmt PAGEdge;
 
+class ICFGNode;
 class ObjTypeInfo;
 
 /*

package/SVF-osx/include/Graphs/SCC.h

@@ -40,11 +40,12 @@
 #ifndef SCC_H_
 #define SCC_H_
 
-#include "SVFIR/SVFValue.h"	// for NodeBS
-#include "Util/WorkList.h"	// for NodeBS
 #include <limits.h>
 #include <stack>
-#include <map>
+
+#include "Graphs/GraphPrinter.h"
+#include "Util/GeneralType.h"
+#include "Util/WorkList.h"
 
 namespace SVF
 {

package/SVF-osx/include/Graphs/WTO.h

@@ -34,8 +34,7 @@
 #ifndef WTO_H_
 #define WTO_H_
 
-#include "SVFIR/SVFType.h"
-#include "SVFIR/SVFValue.h"
+#include "Util/GeneralType.h"
 #include <functional>
 
 namespace SVF
@@ -872,4 +871,4 @@ protected:
 
 } // namespace SVF
 
-#endif /* WTO_H_ */
+#endif /* WTO_H_ */

package/SVF-osx/include/MSSA/MSSAMuChi.h

@@ -30,11 +30,12 @@
 #ifndef MSSAMUCHI_H_
 #define MSSAMUCHI_H_
 
-#include "MSSA/MemRegion.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class MemRegion;
 class MSSADEF;
 
 /*!

package/SVF-osx/include/MSSA/MemPartition.h

@@ -37,6 +37,7 @@
 #define DISNCTMRGENERATOR_H_
 
 #include "MSSA/MemRegion.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {