[Lldb-commits] [lldb] r242944 - Set the live address on child const results in a way that is more maintainable for sustained merges with our internal branches

[Enrico Granata]

Author: enrico
Date: Wed Jul 22 16:39:15 2015
New Revision: 242944

URL: http://llvm.org/viewvc/llvm-project?rev=242944&view=rev
Log:
Set the live address on child const results in a way that is more maintainable for sustained merges with our internal branches


Modified:
    lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp

Modified: lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp?rev=242944&r1=242943&r2=242944&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp (original)
+++ lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp Wed Jul 22 16:39:15 2015
@@ -106,9 +106,8 @@ ValueObjectConstResultImpl::CreateChildA
                                                   child_bitfield_bit_size,
                                                   child_bitfield_bit_offset,
                                                   child_is_base_class,
-                                                  child_is_deref_of_parent);
-        if (m_live_address != LLDB_INVALID_ADDRESS)
-            valobj->m_impl.SetLiveAddress(m_live_address+child_byte_offset);
+                                                  child_is_deref_of_parent,
+                                                  m_live_address == LLDB_INVALID_ADDRESS ? m_live_address : m_live_address+child_byte_offset);
     }
     
     return valobj;