[llvm-branch-commits] [lldb] r200250 - Merged with top of tree.

[Greg Clayton]

Author: gclayton
Date: Mon Jan 27 15:47:44 2014
New Revision: 200250

URL: http://llvm.org/viewvc/llvm-project?rev=200250&view=rev
Log:
Merged with top of tree.


Added:
    lldb/branches/iohandler/test/functionalities/data-formatter/refpointer-recursion/
      - copied from r200249, lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/
Modified:
    lldb/branches/iohandler/   (props changed)
    lldb/branches/iohandler/source/DataFormatters/ValueObjectPrinter.cpp
    lldb/branches/iohandler/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

Propchange: lldb/branches/iohandler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 27 15:47:44 2014
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:198360-200240
+/lldb/trunk:198360-200249

Modified: lldb/branches/iohandler/source/DataFormatters/ValueObjectPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/DataFormatters/ValueObjectPrinter.cpp?rev=200250&r1=200249&r2=200250&view=diff
==============================================================================
--- lldb/branches/iohandler/source/DataFormatters/ValueObjectPrinter.cpp (original)
+++ lldb/branches/iohandler/source/DataFormatters/ValueObjectPrinter.cpp Mon Jan 27 15:47:44 2014
@@ -403,7 +403,6 @@ ValueObjectPrinter::ShouldPrintChildren
         
         // Use a new temporary pointer depth in case we override the
         // current pointer depth below...
-        uint32_t curr_ptr_depth = m_ptr_depth;
         
         if (is_ptr || is_ref)
         {
@@ -413,7 +412,7 @@ ValueObjectPrinter::ShouldPrintChildren
             if (m_valobj->GetPointerValue (&ptr_address_type) == 0)
                 return false;
             
-            else if (is_ref && m_curr_depth == 0)
+            else if (is_ref && m_curr_depth == 0 && curr_ptr_depth == 0)
             {
                 // If this is the root object (depth is zero) that we are showing
                 // and it is a reference, and no pointer depth has been supplied
@@ -468,7 +467,7 @@ ValueObjectPrinter::PrintChild (ValueObj
         ValueObjectPrinter child_printer(child_sp.get(),
                                          m_stream,
                                          child_options,
-                                         (IsPtr() || IsRef()) ? curr_ptr_depth - 1 : curr_ptr_depth,
+                                         (IsPtr() || IsRef()) && curr_ptr_depth >= 1 ? curr_ptr_depth - 1 : curr_ptr_depth,
                                          m_curr_depth + 1);
         child_printer.PrintValueObject();
     }

Modified: lldb/branches/iohandler/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/iohandler/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp?rev=200250&r1=200249&r2=200250&view=diff
==============================================================================
--- lldb/branches/iohandler/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp (original)
+++ lldb/branches/iohandler/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp Mon Jan 27 15:47:44 2014
@@ -811,8 +811,11 @@ GDBRemoteCommunicationServer::Handle_A (
 
     if (success)
     {
+        // FIXME: remove linux restriction once eLaunchFlagDebug is supported
+#if !defined (__linux__)
         m_process_launch_info.GetFlags().Set (eLaunchFlagDebug);
-        m_process_launch_error = Host::LaunchProcess (m_process_launch_info);
+#endif
+        m_process_launch_error = LaunchProcess ();
         if (m_process_launch_info.GetProcessID() != LLDB_INVALID_PROCESS_ID)
         {
             return SendOKResponse ();