Skip to content

[llvm-jitlink-executor] Drop else block after noreturn-if (NFC) #76689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 3, 2024
Merged

[llvm-jitlink-executor] Drop else block after noreturn-if (NFC) #76689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6d97e
[llvm-jitlink-executor] Drop else block after noreturn-if (NFC)
weliveindetail Jan 1, 2024
29f83dc
[llvm-jitlink-executor] Add test-jitloadergdb option in help output
weliveindetail Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 33 additions & 36 deletions llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -159,51 +159,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 {
Expand Down