commit 1b3b2a39443e7c531348338eb02780a36a834d77
author Enrico Granata <egranata@apple.com> Wed Jul 22 21:39:15 2015 +0000
committer Enrico Granata <egranata@apple.com> Wed Jul 22 21:39:15 2015 +0000
tree 93ce65041665182ad3802ac087b06527045a8ef2
parent 483d4ed2120c1f98b62910a4cc83a800e79a8a9d

Set the live address on child const results in a way that is more maintainable for sustained merges with our internal branches

llvm-svn: 242944

lldb/source/Core/ValueObjectConstResultImpl.cpp

diff --git a/lldb/source/Core/ValueObjectConstResultImpl.cpp b/lldb/source/Core/ValueObjectConstResultImpl.cpp
index fce844d..7355063 100644
--- a/lldb/source/Core/ValueObjectConstResultImpl.cpp
+++ b/lldb/source/Core/ValueObjectConstResultImpl.cpp
@@ -106,9 +106,8 @@
                                                   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;