diff options
author | Stefan Gränitz <stefan.graenitz@gmail.com> | 2024-01-03 15:12:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-03 15:12:31 +0100 |
commit | a93c17c9ab7aa7b394313898e0db7aae6adeeaa4 (patch) | |
tree | b0c2321abf11bcb1531a42ed76b534e29cbf576b /llvm/tools/llvm-jitlink | |
parent | 3ae3e40706aad2ce92002a0da24e39d271feb42b (diff) | |
download | llvm-a93c17c9ab7aa7b394313898e0db7aae6adeeaa4.zip llvm-a93c17c9ab7aa7b394313898e0db7aae6adeeaa4.tar.gz llvm-a93c17c9ab7aa7b394313898e0db7aae6adeeaa4.tar.bz2 |
[llvm-jitlink-executor] Drop else block after noreturn-if (NFC) (#76689)
NFC follow-up from https://github.com/llvm/llvm-project/pull/76236
Diffstat (limited to 'llvm/tools/llvm-jitlink')
-rw-r--r-- | llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp index 034c43f..20205ee 100644 --- a/llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp @@ -54,9 +54,9 @@ void printErrorAndExit(Twine ErrMsg) { errs() << "error: " << ErrMsg.str() << "\n\n" << "Usage:\n" << " llvm-jitlink-executor " << DebugOption - << "filedescs=<infd>,<outfd> [args...]\n" + << "[test-jitloadergdb] filedescs=<infd>,<outfd> [args...]\n" << " llvm-jitlink-executor " << DebugOption - << "listen=<host>:<port> [args...]\n"; + << "[test-jitloadergdb] listen=<host>:<port> [args...]\n"; exit(1); } @@ -132,51 +132,48 @@ int main(int argc, char *argv[]) { int InFD = 0; int OutFD = 0; - std::vector<StringRef> TestOutputFlags; - if (argc < 2) printErrorAndExit("insufficient arguments"); - else { - StringRef ConnectArg = argv[FirstProgramArg++]; + + StringRef NextArg = argv[FirstProgramArg++]; #ifndef NDEBUG - if (ConnectArg == "debug") { - DebugFlag = true; - ConnectArg = argv[FirstProgramArg++]; - } + if (NextArg == "debug") { + DebugFlag = true; + NextArg = argv[FirstProgramArg++]; + } #endif - while (ConnectArg.starts_with("test-")) { - TestOutputFlags.push_back(ConnectArg); - ConnectArg = argv[FirstProgramArg++]; - } - - StringRef SpecifierType, Specifier; - std::tie(SpecifierType, Specifier) = ConnectArg.split('='); - if (SpecifierType == "filedescs") { - StringRef FD1Str, FD2Str; - std::tie(FD1Str, FD2Str) = Specifier.split(','); - if (FD1Str.getAsInteger(10, InFD)) - printErrorAndExit(FD1Str + " is not a valid file descriptor"); - if (FD2Str.getAsInteger(10, OutFD)) - printErrorAndExit(FD2Str + " is not a valid file descriptor"); - } else if (SpecifierType == "listen") { - StringRef Host, PortStr; - std::tie(Host, PortStr) = Specifier.split(':'); - - int Port = 0; - if (PortStr.getAsInteger(10, Port)) - printErrorAndExit("port number '" + PortStr + - "' is not a valid integer"); - - InFD = OutFD = openListener(Host.str(), PortStr.str()); - } else - printErrorAndExit("invalid specifier type \"" + SpecifierType + "\""); + std::vector<StringRef> TestOutputFlags; + while (NextArg.starts_with("test-")) { + TestOutputFlags.push_back(NextArg); + NextArg = argv[FirstProgramArg++]; } if (llvm::is_contained(TestOutputFlags, "test-jitloadergdb")) fprintf(stderr, "__jit_debug_descriptor.last_entry = 0x%016" PRIx64 "\n", pointerToJITTargetAddress(findLastDebugDescriptorEntryPtr())); + StringRef SpecifierType, Specifier; + std::tie(SpecifierType, Specifier) = NextArg.split('='); + if (SpecifierType == "filedescs") { + StringRef FD1Str, FD2Str; + std::tie(FD1Str, FD2Str) = Specifier.split(','); + if (FD1Str.getAsInteger(10, InFD)) + printErrorAndExit(FD1Str + " is not a valid file descriptor"); + if (FD2Str.getAsInteger(10, OutFD)) + printErrorAndExit(FD2Str + " is not a valid file descriptor"); + } else if (SpecifierType == "listen") { + StringRef Host, PortStr; + std::tie(Host, PortStr) = Specifier.split(':'); + + int Port = 0; + if (PortStr.getAsInteger(10, Port)) + printErrorAndExit("port number '" + PortStr + "' is not a valid integer"); + + InFD = OutFD = openListener(Host.str(), PortStr.str()); + } else + printErrorAndExit("invalid specifier type \"" + SpecifierType + "\""); + auto Server = ExitOnErr(SimpleRemoteEPCServer::Create<FDSimpleRemoteEPCTransport>( [](SimpleRemoteEPCServer::Setup &S) -> Error { |