diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2018-05-21 15:10:52 +0200 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2018-05-21 20:56:28 +0100 |
| commit | 7e17fe3191fb40360c88d28f1491aae203f0aa03 (patch) | |
| tree | 4257a157fabe0830005f05760341a79fd10882f2 | |
| parent | 5165772d3f03314fb61cc47256b67d923605c951 (diff) | |
| download | klee-7e17fe3191fb40360c88d28f1491aae203f0aa03.tar.gz | |
stop using DEBUG macro name
This is too generic and llvm 6.0 defines DEBUG as follows: #define DEBUG(X) DEBUG_WITH_TYPE(DEBUG_TYPE, X) This then results in various build failures where once the macro is defined, once it is not. So rename this generic macro to KLEE_ARRAY_DEBUG. Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
| -rw-r--r-- | include/klee/SolverStats.h | 2 | ||||
| -rw-r--r-- | include/klee/util/ArrayExprHash.h | 8 | ||||
| -rw-r--r-- | lib/Core/StatsTracker.cpp | 4 | ||||
| -rw-r--r-- | lib/Solver/SolverStats.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/klee/SolverStats.h b/include/klee/SolverStats.h index a38c9826..3f68b620 100644 --- a/include/klee/SolverStats.h +++ b/include/klee/SolverStats.h @@ -28,7 +28,7 @@ namespace stats { extern Statistic queryCounterexamples; extern Statistic queryTime; -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG extern Statistic arrayHashTime; #endif diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h index 23211a70..7fcd8ffb 100644 --- a/include/klee/util/ArrayExprHash.h +++ b/include/klee/util/ArrayExprHash.h @@ -85,7 +85,7 @@ template<class T> bool ArrayExprHash<T>::lookupArrayExpr(const Array* array, T& exp) const { bool res = false; -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG TimerStatIncrementer t(stats::arrayHashTime); #endif @@ -101,7 +101,7 @@ bool ArrayExprHash<T>::lookupArrayExpr(const Array* array, T& exp) const { template<class T> void ArrayExprHash<T>::hashArrayExpr(const Array* array, T& exp) { -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG TimerStatIncrementer t(stats::arrayHashTime); #endif @@ -114,7 +114,7 @@ bool ArrayExprHash<T>::lookupUpdateNodeExpr(const UpdateNode* un, T& exp) const { bool res = false; -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG TimerStatIncrementer t(stats::arrayHashTime); #endif @@ -130,7 +130,7 @@ bool ArrayExprHash<T>::lookupUpdateNodeExpr(const UpdateNode* un, T& exp) const template<class T> void ArrayExprHash<T>::hashUpdateNodeExpr(const UpdateNode* un, T& exp) { -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG TimerStatIncrementer t(stats::arrayHashTime); #endif diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index d9ec35aa..f2a989e2 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -418,7 +418,7 @@ void StatsTracker::writeStatsHeader() { << "'ResolveTime'," << "'QueryCexCacheMisses'," << "'QueryCexCacheHits'," -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG << "'ArrayHashTime'," #endif << ")\n"; @@ -450,7 +450,7 @@ void StatsTracker::writeStatsLine() { << "," << stats::resolveTime / 1000000. << "," << stats::queryCexCacheMisses << "," << stats::queryCexCacheHits -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG << "," << stats::arrayHashTime / 1000000. #endif << ")\n"; diff --git a/lib/Solver/SolverStats.cpp b/lib/Solver/SolverStats.cpp index 4b9c69c8..efdfe6ed 100644 --- a/lib/Solver/SolverStats.cpp +++ b/lib/Solver/SolverStats.cpp @@ -24,6 +24,6 @@ Statistic stats::queryConstructs("QueriesConstructs", "QB"); Statistic stats::queryCounterexamples("QueriesCEX", "Qcex"); Statistic stats::queryTime("QueryTime", "Qtime"); -#ifdef DEBUG +#ifdef KLEE_ARRAY_DEBUG Statistic stats::arrayHashTime("ArrayHashTime", "AHtime"); #endif |