From 1b3b2a39443e7c531348338eb02780a36a834d77 Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Wed, 22 Jul 2015 21:39:15 +0000 Subject: [PATCH] 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 @@ ValueObjectConstResultImpl::CreateChildAtIndex (size_t idx, bool synthetic_array 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; -- 2.7.4