Skip to content

Commit 23b2a50

Browse files
committed
incorporate resolveRemoteAddress
1 parent 9f230a1 commit 23b2a50

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ LLDBMemoryReader::resolvePointer(swift::remote::RemoteAddress address,
133133
if (!target.GetSwiftUseReflectionSymbols())
134134
return pointer;
135135

136-
Address addr;
137-
if (!target.ResolveLoadAddress(address.getAddressData(), addr))
136+
llvm::Optional<Address> maybeAddr =
137+
resolveRemoteAddress(address.getAddressData());
138+
if (!maybeAddr)
138139
return pointer;
140+
auto addr = *maybeAddr;
139141

140142
if (!addr.GetSection()->CanContainSwiftReflectionData())
141143
return pointer;

0 commit comments

Comments
 (0)