From 6204a1faed8f6ed15318be8da3e8e4b5e2f2a4ac Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 7 Jun 2017 13:32:53 +0200 Subject: llvm: don't use clEnumValEnd for LLVM 4.0 It became unnecessary when defining options and mainly undefined. So introduce KLEE_LLVM_CL_VAL_END as suggested by @delcypher. Signed-off-by: Jiri Slaby --- lib/Core/Executor.cpp | 8 ++++---- lib/Core/UserSearcher.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/Core') diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 5af31125..fea9781d 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -156,8 +156,8 @@ namespace { "inst_id]"), clEnumValN(FILE_COMPACT, "compact:file", "Log all instructions to file instructions.txt in format " - "[inst_id]"), - clEnumValEnd), + "[inst_id]") + KLEE_LLVM_CL_VAL_END), llvm::cl::CommaSeparated); #ifdef HAVE_ZLIB_H cl::opt DebugCompressInstructions( @@ -288,8 +288,8 @@ namespace { clEnumValN(Executor::ReadOnly, "ReadOnly", "Write to read-only memory"), clEnumValN(Executor::ReportError, "ReportError", "klee_report_error called"), clEnumValN(Executor::User, "User", "Wrong klee_* functions invocation"), - clEnumValN(Executor::Unhandled, "Unhandled", "Unhandled instruction hit"), - clEnumValEnd), + clEnumValN(Executor::Unhandled, "Unhandled", "Unhandled instruction hit") + KLEE_LLVM_CL_VAL_END), cl::ZeroOrMore); #if LLVM_VERSION_CODE < LLVM_VERSION(3, 0) diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp index 725836e8..2bbbe747 100644 --- a/lib/Core/UserSearcher.cpp +++ b/lib/Core/UserSearcher.cpp @@ -30,8 +30,8 @@ namespace { clEnumValN(Searcher::NURS_Depth, "nurs:depth", "use NURS with 2^depth"), clEnumValN(Searcher::NURS_ICnt, "nurs:icnt", "use NURS with Instr-Count"), clEnumValN(Searcher::NURS_CPICnt, "nurs:cpicnt", "use NURS with CallPath-Instr-Count"), - clEnumValN(Searcher::NURS_QC, "nurs:qc", "use NURS with Query-Cost"), - clEnumValEnd)); + clEnumValN(Searcher::NURS_QC, "nurs:qc", "use NURS with Query-Cost") + KLEE_LLVM_CL_VAL_END)); cl::opt UseIterativeDeepeningTimeSearch("use-iterative-deepening-time-search", -- cgit 1.4.1