From fc50ab32349a4cc61980ba5b97bfa7c3961ce964 Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Fri, 3 Apr 2020 19:37:11 +0100 Subject: Moved header files that were placed directly in include/klee/ into appropriate existing directories and a new directory Statistics; a few missing renames. --- lib/Basic/Statistics.cpp | 2 +- lib/Core/AddressSpace.cpp | 2 +- lib/Core/CallPathManager.cpp | 8 ++++---- lib/Core/CallPathManager.h | 2 +- lib/Core/CoreStats.h | 2 +- lib/Core/Executor.cpp | 8 ++++---- lib/Core/Memory.cpp | 2 +- lib/Core/Searcher.cpp | 1 - lib/Core/SeedInfo.cpp | 2 +- lib/Core/SpecialFunctionHandler.cpp | 1 - lib/Core/StatsTracker.cpp | 1 - lib/Core/TimingSolver.cpp | 2 -- lib/Expr/ArrayExprOptimizer.cpp | 2 +- lib/Expr/Constraints.cpp | 2 +- lib/Expr/Expr.cpp | 2 +- lib/Expr/ExprPPrinter.cpp | 2 +- lib/Module/FunctionAlias.cpp | 3 ++- lib/Module/KModule.cpp | 2 +- lib/Module/Optimize.cpp | 2 +- lib/Solver/CexCachingSolver.cpp | 8 ++++---- lib/Solver/ConstructSolverChain.cpp | 4 ++-- lib/Solver/QueryLoggingSolver.cpp | 4 ++-- lib/Solver/STPSolver.cpp | 4 ++-- lib/Solver/SolverCmdLine.cpp | 2 +- lib/Solver/Z3Solver.cpp | 2 +- 25 files changed, 34 insertions(+), 38 deletions(-) (limited to 'lib') diff --git a/lib/Basic/Statistics.cpp b/lib/Basic/Statistics.cpp index 954051ea..809656ee 100644 --- a/lib/Basic/Statistics.cpp +++ b/lib/Basic/Statistics.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Statistics.h" +#include "klee/Statistics/Statistics.h" #include diff --git a/lib/Core/AddressSpace.cpp b/lib/Core/AddressSpace.cpp index 114e9c8b..82913aa7 100644 --- a/lib/Core/AddressSpace.cpp +++ b/lib/Core/AddressSpace.cpp @@ -13,7 +13,7 @@ #include "TimingSolver.h" #include "klee/Expr/Expr.h" -#include "klee/TimerStatIncrementer.h" +#include "klee/Statistics/TimerStatIncrementer.h" #include "CoreStats.h" diff --git a/lib/Core/CallPathManager.cpp b/lib/Core/CallPathManager.cpp index 6d5ef1a8..2c0e4ae3 100644 --- a/lib/Core/CallPathManager.cpp +++ b/lib/Core/CallPathManager.cpp @@ -9,14 +9,14 @@ #include "CallPathManager.h" -#include "klee/Statistics.h" +#include "klee/Statistics/Statistics.h" -#include -#include #include "llvm/IR/Function.h" - #include "llvm/Support/raw_ostream.h" +#include +#include + using namespace klee; /// diff --git a/lib/Core/CallPathManager.h b/lib/Core/CallPathManager.h index d78c8d8f..3d6acf4b 100644 --- a/lib/Core/CallPathManager.h +++ b/lib/Core/CallPathManager.h @@ -10,7 +10,7 @@ #ifndef KLEE_CALLPATHMANAGER_H #define KLEE_CALLPATHMANAGER_H -#include "klee/Statistics.h" +#include "klee/Statistics/Statistics.h" #include #include diff --git a/lib/Core/CoreStats.h b/lib/Core/CoreStats.h index 42e81de7..1e463c65 100644 --- a/lib/Core/CoreStats.h +++ b/lib/Core/CoreStats.h @@ -10,7 +10,7 @@ #ifndef KLEE_CORESTATS_H #define KLEE_CORESTATS_H -#include "klee/Statistic.h" +#include "klee/Statistics/Statistic.h" namespace klee { namespace stats { diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 0664e606..651dd035 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -25,9 +25,7 @@ #include "TimingSolver.h" #include "UserSearcher.h" -#include "klee/ADT/KTest.h" #include "klee/ADT/RNG.h" -#include "klee/Common.h" #include "klee/Config/Version.h" #include "klee/Core/Interpreter.h" #include "klee/Expr/ArrayExprOptimizer.h" @@ -36,11 +34,14 @@ #include "klee/Expr/ExprPPrinter.h" #include "klee/Expr/ExprSMTLIBPrinter.h" #include "klee/Expr/ExprUtil.h" +#include "klee/Solver/Common.h" +#include "klee/ADT/KTest.h" +#include "klee/Support/OptionCategories.h" +#include "klee/Statistics/TimerStatIncrementer.h" #include "klee/Module/Cell.h" #include "klee/Module/InstructionInfoTable.h" #include "klee/Module/KInstruction.h" #include "klee/Module/KModule.h" -#include "klee/OptionCategories.h" #include "klee/Solver/SolverCmdLine.h" #include "klee/Solver/SolverStats.h" #include "klee/Support/ErrorHandling.h" @@ -49,7 +50,6 @@ #include "klee/Support/ModuleUtil.h" #include "klee/System/MemoryUsage.h" #include "klee/System/Time.h" -#include "klee/TimerStatIncrementer.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringExtras.h" diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp index 35b09011..cb40cd81 100644 --- a/lib/Core/Memory.cpp +++ b/lib/Core/Memory.cpp @@ -15,7 +15,7 @@ #include "klee/ADT/BitArray.h" #include "klee/Expr/ArrayCache.h" #include "klee/Expr/Expr.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "klee/Solver/Solver.h" #include "klee/Support/ErrorHandling.h" diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp index d8119e49..a9c7d318 100644 --- a/lib/Core/Searcher.cpp +++ b/lib/Core/Searcher.cpp @@ -22,7 +22,6 @@ #include "klee/Module/InstructionInfoTable.h" #include "klee/Module/KInstruction.h" #include "klee/Module/KModule.h" -#include "klee/Statistics.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/ModuleUtil.h" #include "klee/System/Time.h" diff --git a/lib/Core/SeedInfo.cpp b/lib/Core/SeedInfo.cpp index 423e9861..d3688313 100644 --- a/lib/Core/SeedInfo.cpp +++ b/lib/Core/SeedInfo.cpp @@ -13,10 +13,10 @@ #include "Memory.h" #include "TimingSolver.h" - #include "klee/ADT/KTest.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" +#include "klee/ADT/KTest.h" #include "klee/Support/ErrorHandling.h" using namespace klee; diff --git a/lib/Core/SpecialFunctionHandler.cpp b/lib/Core/SpecialFunctionHandler.cpp index 52beb89d..d6429883 100644 --- a/lib/Core/SpecialFunctionHandler.cpp +++ b/lib/Core/SpecialFunctionHandler.cpp @@ -19,7 +19,6 @@ #include "klee/Module/KInstruction.h" #include "klee/Module/KModule.h" -#include "klee/OptionCategories.h" #include "klee/Solver/SolverCmdLine.h" #include "klee/Support/Debug.h" #include "klee/Support/ErrorHandling.h" diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index 81db25e3..395babf0 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -12,7 +12,6 @@ #include "ExecutionState.h" #include "klee/Config/Version.h" - #include "klee/Module/InstructionInfoTable.h" #include "klee/Module/KInstruction.h" #include "klee/Module/KModule.h" diff --git a/lib/Core/TimingSolver.cpp b/lib/Core/TimingSolver.cpp index ee829a35..d525a9db 100644 --- a/lib/Core/TimingSolver.cpp +++ b/lib/Core/TimingSolver.cpp @@ -15,8 +15,6 @@ #include "klee/Statistics/Statistics.h" #include "klee/Statistics/TimerStatIncrementer.h" #include "klee/Solver/Solver.h" -#include "klee/Statistics.h" -#include "klee/TimerStatIncrementer.h" #include "CoreStats.h" diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp index bb949fac..8877efd5 100644 --- a/lib/Expr/ArrayExprOptimizer.cpp +++ b/lib/Expr/ArrayExprOptimizer.cpp @@ -16,7 +16,7 @@ #include "klee/Expr/Assignment.h" #include "klee/Expr/AssignmentGenerator.h" #include "klee/Expr/ExprBuilder.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "klee/Support/ErrorHandling.h" #include diff --git a/lib/Expr/Constraints.cpp b/lib/Expr/Constraints.cpp index abf3eafe..89e2ca59 100644 --- a/lib/Expr/Constraints.cpp +++ b/lib/Expr/Constraints.cpp @@ -11,8 +11,8 @@ #include "klee/Expr/ExprPPrinter.h" #include "klee/Expr/ExprVisitor.h" +#include "klee/Support/OptionCategories.h" #include "klee/Module/KModule.h" -#include "klee/OptionCategories.h" #include "llvm/IR/Function.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp index 1deda550..db05e842 100644 --- a/lib/Expr/Expr.cpp +++ b/lib/Expr/Expr.cpp @@ -11,10 +11,10 @@ #include "klee/Config/Version.h" #include "klee/Expr/ExprPPrinter.h" +#include "klee/Support/OptionCategories.h" // FIXME: We shouldn't need this once fast constant support moves into // Core. If we need to do arithmetic, we probably want to use APInt. #include "klee/Support/IntEvaluation.h" -#include "klee/OptionCategories.h" #include "llvm/ADT/Hashing.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Expr/ExprPPrinter.cpp b/lib/Expr/ExprPPrinter.cpp index 50a61cfd..267be7e8 100644 --- a/lib/Expr/ExprPPrinter.cpp +++ b/lib/Expr/ExprPPrinter.cpp @@ -10,7 +10,7 @@ #include "klee/Expr/ExprPPrinter.h" #include "klee/Expr/Constraints.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "klee/Support/PrintContext.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Module/FunctionAlias.cpp b/lib/Module/FunctionAlias.cpp index b0cf5032..2ab8cfd4 100644 --- a/lib/Module/FunctionAlias.cpp +++ b/lib/Module/FunctionAlias.cpp @@ -8,8 +8,9 @@ //===----------------------------------------------------------------------===// #include "Passes.h" + +#include "klee/Support/OptionCategories.h" #include "klee/Support/ErrorHandling.h" -#include "klee/OptionCategories.h" #include "llvm/IR/GlobalAlias.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp index e6c06594..04c8f09f 100644 --- a/lib/Module/KModule.cpp +++ b/lib/Module/KModule.cpp @@ -13,11 +13,11 @@ #include "klee/Config/Version.h" #include "klee/Core/Interpreter.h" +#include "klee/Support/OptionCategories.h" #include "klee/Module/Cell.h" #include "klee/Module/InstructionInfoTable.h" #include "klee/Module/KInstruction.h" #include "klee/Module/KModule.h" -#include "klee/OptionCategories.h" #include "klee/Support/Debug.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/ModuleUtil.h" diff --git a/lib/Module/Optimize.cpp b/lib/Module/Optimize.cpp index 44708b11..96577ade 100644 --- a/lib/Module/Optimize.cpp +++ b/lib/Module/Optimize.cpp @@ -16,7 +16,7 @@ //===----------------------------------------------------------------------===// #include "klee/Config/Version.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #ifdef USE_WORKAROUND_LLVM_PR39177 #include "Passes.h" diff --git a/lib/Solver/CexCachingSolver.cpp b/lib/Solver/CexCachingSolver.cpp index 75aba7ec..45ec5540 100644 --- a/lib/Solver/CexCachingSolver.cpp +++ b/lib/Solver/CexCachingSolver.cpp @@ -9,17 +9,17 @@ #include "klee/Solver/Solver.h" +#include "klee/ADT/MapOfSets.h" #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" #include "klee/Expr/ExprVisitor.h" -#include "klee/ADT/MapOfSets.h" -#include "klee/Support/ErrorHandling.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" +#include "klee/Statistics/TimerStatIncrementer.h" #include "klee/Solver/SolverImpl.h" #include "klee/Solver/SolverStats.h" -#include "klee/TimerStatIncrementer.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Solver/ConstructSolverChain.cpp b/lib/Solver/ConstructSolverChain.cpp index 1459e90a..3dab0361 100644 --- a/lib/Solver/ConstructSolverChain.cpp +++ b/lib/Solver/ConstructSolverChain.cpp @@ -11,10 +11,10 @@ * This file groups declarations that are common to both KLEE and Kleaver. */ -#include "klee/Common.h" +#include "klee/Solver/Common.h" +#include "klee/Solver/SolverCmdLine.h" #include "klee/Support/ErrorHandling.h" #include "klee/System/Time.h" -#include "klee/Solver/SolverCmdLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/QueryLoggingSolver.cpp b/lib/Solver/QueryLoggingSolver.cpp index d24de556..4c3d9b30 100644 --- a/lib/Solver/QueryLoggingSolver.cpp +++ b/lib/Solver/QueryLoggingSolver.cpp @@ -9,11 +9,11 @@ #include "QueryLoggingSolver.h" #include "klee/Config/config.h" +#include "klee/Support/OptionCategories.h" +#include "klee/Statistics/Statistics.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/FileHandling.h" #include "klee/System/Time.h" -#include "klee/OptionCategories.h" -#include "klee/Statistics.h" namespace { llvm::cl::opt DumpPartialQueryiesEarly( diff --git a/lib/Solver/STPSolver.cpp b/lib/Solver/STPSolver.cpp index 82a00d53..95728cde 100644 --- a/lib/Solver/STPSolver.cpp +++ b/lib/Solver/STPSolver.cpp @@ -16,9 +16,9 @@ #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Support/ErrorHandling.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "klee/Solver/SolverImpl.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Errno.h" diff --git a/lib/Solver/SolverCmdLine.cpp b/lib/Solver/SolverCmdLine.cpp index 6cc13b17..7dd8f041 100644 --- a/lib/Solver/SolverCmdLine.cpp +++ b/lib/Solver/SolverCmdLine.cpp @@ -15,7 +15,7 @@ #include "klee/Solver/SolverCmdLine.h" #include "klee/Config/Version.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringMap.h" diff --git a/lib/Solver/Z3Solver.cpp b/lib/Solver/Z3Solver.cpp index 325a4dc9..85943e4f 100644 --- a/lib/Solver/Z3Solver.cpp +++ b/lib/Solver/Z3Solver.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #include "klee/Config/config.h" +#include "klee/Support/OptionCategories.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/FileHandling.h" -#include "klee/OptionCategories.h" #ifdef ENABLE_Z3 -- cgit 1.4.1