Fix Arg0 argument after r229110. The problem was that Arg0ValueChangedCallback isn't twitching when Arg0 was updated, therefore target was launched with empty 1st argument or without it at all. In this patch I update Arg0 by hand.

llvm-svn: 229125

3 files changed, 4 insertions, 3 deletions

diff --git a/lldb/include/lldb/Target/Target.h b/lldb/include/lldb/Target/Target.h
index e7d30b8e5c1..971269804a8 100644
--- a/lldb/include/lldb/Target/Target.h
+++ b/lldb/include/lldb/Target/Target.h
@@ -201,7 +201,7 @@ public:
     SetDisplayRuntimeSupportValues (bool b);
 
     const ProcessLaunchInfo &
-    GetProcessLaunchInfo() const;
+    GetProcessLaunchInfo();
 
     void
     SetProcessLaunchInfo(const ProcessLaunchInfo &launch_info);
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 29045c00ff1..85206d4a1a5 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -249,7 +249,7 @@ protected:
 
         if (launch_args.GetArgumentCount() == 0)
         {
-            m_options.launch_info.GetArguments() = target->GetProcessLaunchInfo().GetArguments();
+            m_options.launch_info.GetArguments().AppendArguments (target->GetProcessLaunchInfo().GetArguments());
         }
         else
         {
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index 2d951f4b6c0..34e1b65f054 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3407,8 +3407,9 @@ TargetProperties::SetDisplayRuntimeSupportValues (bool b)
 }
 
 const ProcessLaunchInfo &
-TargetProperties::GetProcessLaunchInfo () const
+TargetProperties::GetProcessLaunchInfo ()
 {
+    m_launch_info.SetArg0(GetArg0()); // FIXME: Arg0 callback doesn't work
     return m_launch_info;
 }