diff options
| author | Cristian Cadar <cristic@cs.stanford.edu> | 2012-07-31 17:21:30 +0000 |
|---|---|---|
| committer | Cristian Cadar <cristic@cs.stanford.edu> | 2012-07-31 17:21:30 +0000 |
| commit | c582aa704b9f0d2729e76251aeb4676d4cb866a6 (patch) | |
| tree | a8303928c18d72cad31f08cb07407ec080e9949d /lib/Solver | |
| parent | 1fdb4ef41ea8a87225f751fa87534c5ac1751d40 (diff) | |
| download | klee-c582aa704b9f0d2729e76251aeb4676d4cb866a6.tar.gz | |
Patch by Dan Liew that removes our internal copy of STP, and makes the --with-stp option mandatory:
"1. At configure time the --with-stp= option is now mandatory. 2. The HAVE_EXT_STP macro has been removed. 3. The ENABLE_EXT_STP autoconf replacement variable has been removed and consequently the Makefile variable of the same name has been removed." git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161055 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Solver')
| -rw-r--r-- | lib/Solver/STPBuilder.h | 4 | ||||
| -rw-r--r-- | lib/Solver/Solver.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/Solver/STPBuilder.h b/lib/Solver/STPBuilder.h index 2b34c911..3a19a639 100644 --- a/lib/Solver/STPBuilder.h +++ b/lib/Solver/STPBuilder.h @@ -17,11 +17,7 @@ #include <map> #define Expr VCExpr -#ifdef HAVE_EXT_STP #include <stp/c_interface.h> -#else -#include "../../stp/c_interface/c_interface.h" -#endif #if ENABLE_STPLOG == 1 #include "stp/stplog.h" diff --git a/lib/Solver/Solver.cpp b/lib/Solver/Solver.cpp index 9f0d89af..7430a58b 100644 --- a/lib/Solver/Solver.cpp +++ b/lib/Solver/Solver.cpp @@ -454,7 +454,6 @@ STPSolverImpl::STPSolverImpl(STPSolver *_solver, bool _useForkedSTP, bool _optim assert(vc && "unable to create validity checker"); assert(builder && "unable to create STPBuilder"); -#ifdef HAVE_EXT_STP // In newer versions of STP, a memory management mechanism has been // introduced that automatically invalidates certain C interface // pointers at vc_Destroy time. This caused double-free errors @@ -462,7 +461,7 @@ STPSolverImpl::STPSolverImpl(STPSolver *_solver, bool _useForkedSTP, bool _optim // the pointers using vc_DeleteExpr. By setting EXPRDELETE to 0 // we restore the old behaviour. vc_setInterfaceFlags(vc, EXPRDELETE, 0); -#endif + vc_registerErrorHandler(::stp_error_handler); if (useForkedSTP) { |