[Lldb-commits] [lldb] r229125 - 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.

[Ilia K]

Author: ki.stfu
Date: Fri Feb 13 11:07:55 2015
New Revision: 229125

URL: http://llvm.org/viewvc/llvm-project?rev=229125&view=rev
Log:
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.


Modified:
    lldb/trunk/include/lldb/Target/Target.h
    lldb/trunk/source/Commands/CommandObjectProcess.cpp
    lldb/trunk/source/Target/Target.cpp

Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=229125&r1=229124&r2=229125&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Fri Feb 13 11:07:55 2015
@@ -201,7 +201,7 @@ public:
     SetDisplayRuntimeSupportValues (bool b);
 
     const ProcessLaunchInfo &
-    GetProcessLaunchInfo() const;
+    GetProcessLaunchInfo();
 
     void
     SetProcessLaunchInfo(const ProcessLaunchInfo &launch_info);

Modified: lldb/trunk/source/Commands/CommandObjectProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectProcess.cpp?rev=229125&r1=229124&r2=229125&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectProcess.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectProcess.cpp Fri Feb 13 11:07:55 2015
@@ -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
         {

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=229125&r1=229124&r2=229125&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Fri Feb 13 11:07:55 2015
@@ -3407,8 +3407,9 @@ TargetProperties::SetDisplayRuntimeSuppo
 }
 
 const ProcessLaunchInfo &
-TargetProperties::GetProcessLaunchInfo () const
+TargetProperties::GetProcessLaunchInfo ()
 {
+    m_launch_info.SetArg0(GetArg0()); // FIXME: Arg0 callback doesn't work
     return m_launch_info;
 }