Skip to content

Commit 6b16a52

Browse files
committed
Re-enable Pavel's patch from: https://reviews.llvm.org/D69273 and make it work with swift.
1 parent 9932e2d commit 6b16a52

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

lldb/source/Core/ValueObject.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ bool ValueObject::UpdateValueIfNeeded(bool update_format) {
279279
SetValueIsValid(success);
280280

281281
if (success) {
282+
UpdateChildrenAddressType();
282283
const uint64_t max_checksum_size = 128;
283284
m_data.Checksum(m_value_checksum, max_checksum_size);
284285
} else {

lldb/source/Core/ValueObjectChild.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ bool ValueObjectChild::UpdateValue() {
141141
bool deref;
142142
std::tie(addr, deref) =
143143
runtime->FixupPointerValue(addr, parent_type);
144+
// The runtime will always return an address in the target.
145+
// So make sure we force that here.
146+
parent->SetAddressTypeOfChildren(eAddressTypeLoad);
144147
if (deref) {
145148
// Read the pointer to the Objective-C object.
146149
Target &target = process_sp->GetTarget();

0 commit comments

Comments
 (0)