mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-21 16:46:58 +00:00
Code Issues Projects Releases Wiki Activity

[lldb] Respect LaunchInfo::SetExecutable in ProcessLauncherPosixFork ()

Browse Source 
Using argv[0] for this was incorrect. I'm ignoring LaunchInfo::SetArg0,
as that's what darwin and windows launchers do (they use the first
element of the args vector instead).

I picked up the funny unit test re-exec method from the llvm unit tests.
This commit is contained in:
Pavel Labath 2025-03-27 12:44:56 +01:00 committed by GitHub
parent a9672515ce
commit 39e7efe1e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 3 deletions
lldb
source/Host/posix
ProcessLauncherPosixFork.cpp
unittests/Host
HostTest.cpp

8
lldb/source/Host/posix/ProcessLauncherPosixFork.cpp

@ -94,6 +94,7 @@ struct ForkLaunchInfo {
bool debug;
bool disable_aslr;
std::string wd;
std::string executable;
const char **argv;
Environment::Envp envp;
std::vector<ForkFileAction> actions;
@ -194,7 +195,8 @@ struct ForkLaunchInfo {
}
// Execute. We should never return...
execve(info.argv[0], const_cast<char *const *>(info.argv), info.envp);
execve(info.executable.c_str(), const_cast<char *const *>(info.argv),
info.envp);
#if defined(__linux__)
if (errno == ETXTBSY) {
@ -207,7 +209,8 @@ struct ForkLaunchInfo {
// Since this state should clear up quickly, wait a while and then give it
// one more go.
usleep(50000);
execve(info.argv[0], const_cast<char *const *>(info.argv), info.envp);
execve(info.executable.c_str(), const_cast<char *const *>(info.argv),
info.envp);
}
#endif
@ -236,6 +239,7 @@ ForkLaunchInfo::ForkLaunchInfo(const ProcessLaunchInfo &info)
debug(info.GetFlags().Test(eLaunchFlagDebug)),
disable_aslr(info.GetFlags().Test(eLaunchFlagDisableASLR)),
wd(info.GetWorkingDirectory().GetPath()),
executable(info.GetExecutableFile().GetPath()),
argv(info.GetArguments().GetConstArgumentVector()),
envp(info.GetEnvironment().getEnvp()), actions(MakeForkActions(info)) {}

43
lldb/unittests/Host/HostTest.cpp

@ -7,12 +7,24 @@
//===----------------------------------------------------------------------===//
#include "lldb/Host/Host.h"
#include "TestingSupport/SubsystemRAII.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Host/ProcessLaunchInfo.h"
#include "lldb/Utility/ProcessInfo.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Testing/Support/Error.h"
#include "gtest/gtest.h"
#include <future>
using namespace lldb_private;
using namespace llvm;
// From TestMain.cpp.
extern const char *TestMainArgv0;
static cl::opt<uint64_t> test_arg("test-arg");
TEST(Host, WaitStatusFormat) {
EXPECT_EQ("W01", formatv("{0:g}", WaitStatus{WaitStatus::Exit, 1}).str());
EXPECT_EQ("X02", formatv("{0:g}", WaitStatus{WaitStatus::Signal, 2}).str());
@ -45,4 +57,33 @@ TEST(Host, ProcessInstanceInfoCumulativeSystemTimeIsValid) {
EXPECT_TRUE(info.CumulativeSystemTimeIsValid());
info.SetCumulativeSystemTime(ProcessInstanceInfo::timespec{1, 0});
EXPECT_TRUE(info.CumulativeSystemTimeIsValid());
}
}
TEST(Host, LaunchProcessSetsArgv0) {
SubsystemRAII<FileSystem> subsystems;
static constexpr StringLiteral TestArgv0 = "HelloArgv0";
if (test_arg != 0) {
// In subprocess
if (TestMainArgv0 != TestArgv0) {
errs() << formatv("Got '{0}' for argv[0]\n", TestMainArgv0);
exit(1);
}
exit(0);
}
ProcessLaunchInfo info;
info.SetExecutableFile(
FileSpec(llvm::sys::fs::getMainExecutable(TestMainArgv0, &test_arg)),
/*add_exe_file_as_first_arg=*/false);
info.GetArguments().AppendArgument("HelloArgv0");
info.GetArguments().AppendArgument(
"--gtest_filter=Host.LaunchProcessSetsArgv0");
info.GetArguments().AppendArgument("--test-arg=47");
std::promise<int> exit_status;
info.SetMonitorProcessCallback([&](lldb::pid_t pid, int signal, int status) {
exit_status.set_value(status);
});
ASSERT_THAT_ERROR(Host::LaunchProcess(info).takeError(), Succeeded());
ASSERT_THAT(exit_status.get_future().get(), 0);
}