about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2017-06-07 13:37:10 +0200
committerDan Liew <delcypher@gmail.com>2017-06-07 15:24:13 +0100
commit48321b4572b494b3e2cb24222043f617424596ee (patch)
treee93d542edac6b45c7ebc3b2214520a39ff5c4303
parent82c7d357dcc8b4c25932d5887671210f2ba49b0f (diff)
downloadklee-48321b4572b494b3e2cb24222043f617424596ee.tar.gz
llvm: rename ExitOnError to OptExitOnError
ExitOnError collides with llvm::ExitOnError from LLVM 4:
tools/klee/main.cpp:430:23: error: reference to 'ExitOnError' is ambiguous
  if (errorMessage && ExitOnError) {
                      ^
/usr/include/llvm/Support/Error.h:938:7: note: candidate found by name lookup is 'llvm::ExitOnError'
class ExitOnError {
      ^
klee/tools/klee/main.cpp:141:3: note: candidate found by name lookup is '(anonymous namespace)::ExitOnError'
  ExitOnError("exit-on-error",
  ^
1 error generated.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
-rw-r--r--tools/klee/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 9e36f949..b74789fa 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -132,7 +132,7 @@ namespace {
                 cl::desc("Write .sym.path files for each test case"));
 
   cl::opt<bool>
-  ExitOnError("exit-on-error",
+  OptExitOnError("exit-on-error",
               cl::desc("Exit if errors occur"));
 
 
@@ -413,7 +413,7 @@ llvm::raw_fd_ostream *KleeHandler::openTestFile(const std::string &suffix,
 void KleeHandler::processTestCase(const ExecutionState &state,
                                   const char *errorMessage,
                                   const char *errorSuffix) {
-  if (errorMessage && ExitOnError) {
+  if (errorMessage && OptExitOnError) {
     m_interpreter->prepareForEarlyExit();
     klee_error("EXITING ON ERROR:\n%s\n", errorMessage);
   }