[lldb] Make SBTarget::LaunchSimple start form the target's LaunchInfo

[JDevlieghere]

Summary

Currently SBTarget::LaunchSimple creates a new LaunchInfo which means it ignores any target properties that have been set. Instead, it should start from the target's LaunchInfo and populated the specified fields.

[JDevlieghere]

Add test

[JDevlieghere]

Test a few more cases

[JDevlieghere]

Address Jim's offline feedback about GetProcessLaunchInfo including the executable.

[jingham]

LGTM

[JDevlieghere]

lldb/source/Target/Target.cpp

3918 ↗

(On Diff #283100)

Unfortunately doing this here doesn't work. Some of the code that's using GetProcessLaunchInfo() depends on the assumption that the m_arguments list in ProcessInfo does not contain argv[0], while other code, most notably the code to actually launch a binary, depends on it being the first argument. So whatever I do here, I break some code.

[JDevlieghere]

Back to previous revision.

[max-kudr]

@JDevlieghere This change is is failing LLDB Windows buildbot since build 18051. Can you please fix that?

[JDevlieghere]

In D85235#2198013, @max-kudr wrote:

@JDevlieghere This change is is failing LLDB Windows buildbot since build 18051. Can you please fix that?

Thanks for the heads up. I had just pushed a fix:

commit 927afdffbb1deebd83b86d024b67687d758521d0 
Author: Jonas Devlieghere <[e-mail]>
Date:   Wed Aug 5 15:37:50 2020 -0700

    [lldb] Skip test_launch_simple on Windows

    Because stdio manipulation unsupported on Windows.

[max-kudr]

Thank you!

[omjavaid]

In D85235#2198062, @JDevlieghere wrote:

In D85235#2198013, @max-kudr wrote:

@JDevlieghere This change is is failing LLDB Windows buildbot since build 18051. Can you please fix that?

Thanks for the heads up. I had just pushed a fix:

commit 927afdffbb1deebd83b86d024b67687d758521d0 
Author: Jonas Devlieghere <[e-mail]>
Date:   Wed Aug 5 15:37:50 2020 -0700

    [lldb] Skip test_launch_simple on Windows

    Because stdio manipulation unsupported on Windows.

This still fails on http://lab.llvm.org:8011/builders/lldb-aarch64-ubuntu and http://lab.llvm.org:8011/builders/lldb-arm-ubuntu

lldb/source/API/SBTarget.cpp

 }
 
 SBProcess SBTarget::LaunchSimple(char const **argv, char const **envp,
                                  const char *working_directory) {
   LLDB_RECORD_METHOD(lldb::SBProcess, SBTarget, LaunchSimple,
                      (const char **, const char **, const char *), argv, envp,
                      working_directory);
 
-  char *stdin_path = nullptr;
-  char *stdout_path = nullptr;
-  char *stderr_path = nullptr;
-  uint32_t launch_flags = 0;
-  bool stop_at_entry = false;
+  TargetSP target_sp = GetSP();
+  if (!target_sp)
+    return LLDB_RECORD_RESULT(SBProcess());
+
+  SBLaunchInfo launch_info = GetLaunchInfo();
+
+  if (Module *exe_module = target_sp->GetExecutableModulePointer())
+    launch_info.SetExecutableFile(exe_module->GetPlatformFileSpec(),
+                                  /*add_as_first_arg*/ true);
+  if (argv)
+    launch_info.SetArguments(argv, /*append*/ true);
+  if (envp)
+    launch_info.SetEnvironmentEntries(envp, /*append*/ false);
+  if (working_directory)
+    launch_info.SetWorkingDirectory(working_directory);
+
   SBError error;
-  SBListener listener = GetDebugger().GetListener();
-  return LLDB_RECORD_RESULT(Launch(listener, argv, envp, stdin_path,
-                                   stdout_path, stderr_path, working_directory,
-                                   launch_flags, stop_at_entry, error));
+  return LLDB_RECORD_RESULT(Launch(launch_info, error));
 }
 
 SBError SBTarget::Install() {
   LLDB_RECORD_METHOD_NO_ARGS(lldb::SBError, SBTarget, Install);
 
   SBError sb_error;
   TargetSP target_sp(GetSP());
   if (target_sp) {

lldb/test/API/python_api/target/TestTargetAPI.py

def test_read_memory(self):
         # module
         data_section = self.find_data_section(target)
         sb_addr = lldb.SBAddress(data_section, 0)
         error = lldb.SBError()
         content = target.ReadMemory(sb_addr, 1, error)
         self.assertTrue(error.Success(), "Make sure memory read succeeded")
         self.assertEqual(len(content), 1)
 
+
+    @add_test_categories(['pyapi'])
+    def test_launch_simple(self):
+        d = {'EXE': 'b.out'}
+        self.build(dictionary=d)
+        self.setTearDownCleanup(dictionary=d)
+        target = self.create_simple_target('b.out')
+
+        process = target.LaunchSimple(
+            ['foo', 'bar'], ['baz'], self.get_process_working_directory())
+        self.runCmd("run")
+        output = process.GetSTDOUT(9999)
+        self.assertIn('arg: foo', output)
+        self.assertIn('arg: bar', output)
+        self.assertIn('env: baz', output)
+
+        self.runCmd("setting set target.run-args foo")
+        self.runCmd("setting set target.env-vars bar=baz")
+        process = target.LaunchSimple(None, None,
+                                      self.get_process_working_directory())
+        self.runCmd("run")
+        output = process.GetSTDOUT(9999)
+        self.assertIn('arg: foo', output)
+        self.assertIn('env: bar=baz', output)
+
+        self.runCmd("settings set target.disable-stdio true")
+        process = target.LaunchSimple(
+            None, None, self.get_process_working_directory())
+        self.runCmd("run")
+        output = process.GetSTDOUT(9999)
+        self.assertEqual(output, "")
+
     def create_simple_target(self, fn):
         exe = self.getBuildArtifact(fn)
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         return target
 
     def find_data_section(self, target):
         mod = target.GetModuleAtIndex(0)

lldb/test/API/python_api/target/main.c

int b(int val)
     return c(val);
 }
 
 int c(int val)
 {
     return val + 3;
 }
 
-int main (int argc, char const *argv[])
+int main (int argc, char const *argv[], char** env)
 {
     // Set a break at entry to main.
     int A1 = a(1);  // a(1) -> b(1) -> c(1)
     printf("a(1) returns %d\n", A1);
-    
     int B2 = b(2);  // b(2) -> c(2)
     printf("b(2) returns %d\n", B2);
-    
     int A3 = a(3);  // a(3) -> c(3)
     printf("a(3) returns %d\n", A3);
-    
+    for (int i = 1; i < argc; i++) {
+      printf("arg: %s\n", argv[i]);
+    }
+
+    while (*env)
+      printf("env: %s\n", *env++);
+
     return 0;
 }