Skip to content

[lldb] Fix local buffer not being popped #10700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[lldb] Fix local buffer not being popped #10700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 73 additions & 68 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeDynamicTypeResolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2306,86 +2306,91 @@ bool SwiftLanguageRuntime::GetDynamicTypeAndAddress_Existential(
return false;
}

// This scope is needed because the validation code will call PushLocalBuffer,
// so we need to pop it before that call.
{
if (use_local_buffer)
PushLocalBuffer(
existential_address,
llvm::expectedToOptional(in_value.GetByteSize()).value_or(0));
auto defer = llvm::make_scope_exit([&] {
if (use_local_buffer)
PopLocalBuffer();
});

if (use_local_buffer)
PushLocalBuffer(
existential_address,
llvm::expectedToOptional(in_value.GetByteSize()).value_or(0));

swift::remote::RemoteAddress remote_existential(existential_address);

ThreadSafeReflectionContext reflection_ctx = GetReflectionContext();
if (!reflection_ctx)
return false;
auto tr_ts = tss->GetTypeSystemSwiftTypeRef();
if (!tr_ts)
return false;

auto flavor = SwiftLanguageRuntime::GetManglingFlavor(
existential_type.GetMangledTypeName());
CompilerType dynamic_type;
uint64_t dynamic_address = 0;
if (flavor == swift::Mangle::ManglingFlavor::Default) {
auto pair = reflection_ctx->ProjectExistentialAndUnwrapClass(
remote_existential, *existential_typeref, tr_ts->GetDescriptorFinder());

if (!pair) {
if (log)
log->Printf("Runtime failed to get dynamic type of existential");
return false;
}

const swift::reflection::TypeRef *typeref;
swift::remote::RemoteAddress out_address(nullptr);
std::tie(typeref, out_address) = *pair;
swift::remote::RemoteAddress remote_existential(existential_address);

auto ts = tss->GetTypeSystemSwiftTypeRef();
if (!ts)
return false;
swift::Demangle::Demangler dem;
swift::Demangle::NodePointer node = typeref->getDemangling(dem);
dynamic_type = ts->RemangleAsType(dem, node, flavor);
dynamic_address = out_address.getAddressData();
} else {
// In the embedded Swift case, the existential container just points to the
// instance.
auto reflection_ctx = GetReflectionContext();
ThreadSafeReflectionContext reflection_ctx = GetReflectionContext();
if (!reflection_ctx)
return false;
auto maybe_addr_or_symbol =
reflection_ctx->ReadPointer(existential_address);
if (!maybe_addr_or_symbol)
auto tr_ts = tss->GetTypeSystemSwiftTypeRef();
if (!tr_ts)
return false;

uint64_t address = 0;
if (maybe_addr_or_symbol->isResolved()) {
address = maybe_addr_or_symbol->getOffset();
auto flavor = SwiftLanguageRuntime::GetManglingFlavor(
existential_type.GetMangledTypeName());
CompilerType dynamic_type;
uint64_t dynamic_address = 0;
if (flavor == swift::Mangle::ManglingFlavor::Default) {
auto pair = reflection_ctx->ProjectExistentialAndUnwrapClass(
remote_existential, *existential_typeref,
tr_ts->GetDescriptorFinder());

if (!pair) {
if (log)
log->Printf("Runtime failed to get dynamic type of existential");
return false;
}

const swift::reflection::TypeRef *typeref;
swift::remote::RemoteAddress out_address(nullptr);
std::tie(typeref, out_address) = *pair;

auto ts = tss->GetTypeSystemSwiftTypeRef();
if (!ts)
return false;
swift::Demangle::Demangler dem;
swift::Demangle::NodePointer node = typeref->getDemangling(dem);
dynamic_type = ts->RemangleAsType(dem, node, flavor);
dynamic_address = out_address.getAddressData();
} else {
SymbolContextList sc_list;
auto &module_list = GetProcess().GetTarget().GetImages();
module_list.FindSymbolsWithNameAndType(
ConstString(maybe_addr_or_symbol->getSymbol()), eSymbolTypeAny,
sc_list);
if (sc_list.GetSize() != 1)
// In the embedded Swift case, the existential container just points to
// the instance.
auto reflection_ctx = GetReflectionContext();
if (!reflection_ctx)
return false;
auto maybe_addr_or_symbol =
reflection_ctx->ReadPointer(existential_address);
if (!maybe_addr_or_symbol)
return false;

SymbolContext sc = sc_list[0];
Symbol *symbol = sc.symbol;
address = symbol->GetLoadAddress(&GetProcess().GetTarget());
uint64_t address = 0;
if (maybe_addr_or_symbol->isResolved()) {
address = maybe_addr_or_symbol->getOffset();
} else {
SymbolContextList sc_list;
auto &module_list = GetProcess().GetTarget().GetImages();
module_list.FindSymbolsWithNameAndType(
ConstString(maybe_addr_or_symbol->getSymbol()), eSymbolTypeAny,
sc_list);
if (sc_list.GetSize() != 1)
return false;

SymbolContext sc = sc_list[0];
Symbol *symbol = sc.symbol;
address = symbol->GetLoadAddress(&GetProcess().GetTarget());
}

dynamic_type =
GetDynamicTypeAndAddress_EmbeddedClass(address, existential_type);
if (!dynamic_type)
return false;
dynamic_address = maybe_addr_or_symbol->getOffset();
}

dynamic_type =
GetDynamicTypeAndAddress_EmbeddedClass(address, existential_type);
if (!dynamic_type)
return false;
dynamic_address = maybe_addr_or_symbol->getOffset();
class_type_or_name.SetCompilerType(dynamic_type);
address.SetRawAddress(dynamic_address);
}
if (use_local_buffer)
PopLocalBuffer();

class_type_or_name.SetCompilerType(dynamic_type);
address.SetRawAddress(dynamic_address);

#ifndef NDEBUG
if (ModuleList::GetGlobalModuleListProperties()
.GetSwiftValidateTypeSystem()) {
Expand Down