up to 3.1+20250106 & llvm14

OBS-URL: https://build.opensuse.org/package/show/devel:tools:statica/klee?expand=0&rev=145
This commit is contained in:
Jiri Slaby 2025-02-03 12:11:22 +00:00 committed by Git OBS Bridge
parent 08c4245089
commit 4ce0cd0779
2 changed files with 5 additions and 10 deletions

View File

@ -18,9 +18,7 @@
#include "llvm/FileCheck/FileCheck.h" #include "llvm/FileCheck/FileCheck.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/InitLLVM.h" #include "llvm/Support/InitLLVM.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Process.h" #include "llvm/Support/Process.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/WithColor.h" #include "llvm/Support/WithColor.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include <cmath> #include <cmath>
@ -81,7 +79,7 @@ static cl::opt<bool> AllowEmptyInput(
"checks that some error message does not occur, for example.")); "checks that some error message does not occur, for example."));
static cl::opt<bool> AllowUnusedPrefixes( static cl::opt<bool> AllowUnusedPrefixes(
"allow-unused-prefixes", "allow-unused-prefixes", cl::init(false), cl::ZeroOrMore,
cl::desc("Allow prefixes to be specified but not appear in the test.")); cl::desc("Allow prefixes to be specified but not appear in the test."));
static cl::opt<bool> MatchFullLines( static cl::opt<bool> MatchFullLines(
@ -104,12 +102,12 @@ static cl::opt<bool> AllowDeprecatedDagOverlap(
"non-overlapping CHECK-DAG implementation.\n")); "non-overlapping CHECK-DAG implementation.\n"));
static cl::opt<bool> Verbose( static cl::opt<bool> Verbose(
"v", "v", cl::init(false), cl::ZeroOrMore,
cl::desc("Print directive pattern matches, or add them to the input dump\n" cl::desc("Print directive pattern matches, or add them to the input dump\n"
"if enabled.\n")); "if enabled.\n"));
static cl::opt<bool> VerboseVerbose( static cl::opt<bool> VerboseVerbose(
"vv", "vv", cl::init(false), cl::ZeroOrMore,
cl::desc("Print information helpful in diagnosing internal FileCheck\n" cl::desc("Print information helpful in diagnosing internal FileCheck\n"
"issues, or add it to the input dump if enabled. Implies\n" "issues, or add it to the input dump if enabled. Implies\n"
"-v.\n")); "-v.\n"));
@ -369,8 +367,6 @@ static std::string GetCheckTypeAbbreviation(Check::FileCheckType Ty) {
return "bad-not"; return "bad-not";
case Check::CheckBadCount: case Check::CheckBadCount:
return "bad-count"; return "bad-count";
case Check::CheckMisspelled:
return "misspelled";
case Check::CheckNone: case Check::CheckNone:
llvm_unreachable("invalid FileCheckType"); llvm_unreachable("invalid FileCheckType");
} }
@ -634,7 +630,7 @@ static void DumpAnnotatedInput(raw_ostream &OS, const FileCheckRequest &Req,
// -dump-input-filter. However, in case the resulting ellipsis would occupy // -dump-input-filter. However, in case the resulting ellipsis would occupy
// more lines than the input lines and annotations it elides, buffer the // more lines than the input lines and annotations it elides, buffer the
// elided lines and annotations so we can print them instead. // elided lines and annotations so we can print them instead.
raw_ostream *LineOS; raw_ostream *LineOS = &OS;
if ((!PrevLineInFilter || PrevLineInFilter + DumpInputContext < Line) && if ((!PrevLineInFilter || PrevLineInFilter + DumpInputContext < Line) &&
(NextLineInFilter == UINT_MAX || (NextLineInFilter == UINT_MAX ||
Line + DumpInputContext < NextLineInFilter)) Line + DumpInputContext < NextLineInFilter))

View File

@ -58,8 +58,7 @@ int main(int argc, const char **argv) {
for (int i = 0; i < argc; ++i) for (int i = 0; i < argc; ++i)
Argv.push_back(argv[i]); Argv.push_back(argv[i]);
std::string ErrMsg; std::string ErrMsg;
int Result = int Result = sys::ExecuteAndWait(*Program, Argv, None, {}, 0, 0, &ErrMsg);
sys::ExecuteAndWait(*Program, Argv, std::nullopt, {}, 0, 0, &ErrMsg);
#ifdef _WIN32 #ifdef _WIN32
// Handle abort() in msvcrt -- It has exit code as 3. abort(), aka // Handle abort() in msvcrt -- It has exit code as 3. abort(), aka
// unreachable, should be recognized as a crash. However, some binaries use // unreachable, should be recognized as a crash. However, some binaries use