Skip to content

Commit 417ba5a

Browse files
committed
Remove dependency on #3800
1 parent ab4878b commit 417ba5a

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,9 @@ LLDBMemoryReader::resolvePointer(swift::remote::RemoteAddress address,
131131
if (!target.GetSwiftUseReflectionSymbols())
132132
return pointer;
133133

134-
llvm::Optional<Address> maybeAddr =
135-
resolveRemoteAddress(address.getAddressData());
136-
// This is not an assert, but should never happen.
137-
if (!maybeAddr)
138-
return pointer;
139-
140134
Address addr;
141-
if (maybeAddr->IsSectionOffset()) {
142-
// `address` was tagged, and then successfully mapped (resolved).
143-
addr = *maybeAddr;
144-
} else {
145-
// `address` is a real load address.
146-
if (!target.ResolveLoadAddress(address.getAddressData(), addr))
147-
return pointer;
148-
}
135+
if (!target.ResolveLoadAddress(address.getAddressData(), addr))
136+
return pointer;
149137

150138
if (!addr.GetSection()->CanContainSwiftReflectionData())
151139
return pointer;

0 commit comments

Comments
 (0)