[lldb] Fix local buffer not being popped #10718
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,7 @@ class SwiftLanguageRuntimeStub; | |
| class SwiftLanguageRuntimeImpl; | ||
| class ReflectionContextInterface; | ||
| class LLDBMemoryReader; | ||
| class MemoryReaderLocalBufferHolder; | ||
| struct SuperClassType; | ||
|
|
||
| using ThreadSafeReflectionContext = LockGuarded<ReflectionContextInterface>; | ||
|
|
@@ -726,9 +727,8 @@ class SwiftLanguageRuntime : public LanguageRuntime { | |
|
|
||
| std::shared_ptr<LLDBMemoryReader> GetMemoryReader(); | ||
|
|
||
| MemoryReaderLocalBufferHolder PushLocalBuffer(uint64_t local_buffer, | ||
| uint64_t local_buffer_size); | ||
|
|
||
| // These are the helper functions for GetObjectDescription for various | ||
| // types of swift objects. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -260,15 +260,12 @@ std::shared_ptr<LLDBMemoryReader> SwiftLanguageRuntime::GetMemoryReader() { | |
| return m_memory_reader_sp; | ||
| } | ||
|
|
||
| MemoryReaderLocalBufferHolder SwiftLanguageRuntime::PushLocalBuffer(uint64_t local_buffer, | ||
| uint64_t local_buffer_size) { | ||
| return ((LLDBMemoryReader *)GetMemoryReader().get()) | ||
| ->pushLocalBuffer(local_buffer, local_buffer_size); | ||
| } | ||
|
|
||
|
|
||
| class LLDBTypeInfoProvider : public swift::remote::TypeInfoProvider { | ||
| SwiftLanguageRuntime &m_runtime; | ||
|
|
@@ -1599,8 +1596,7 @@ llvm::Expected<std::string> SwiftLanguageRuntime::GetEnumCaseName( | |
| return ""; | ||
|
|
||
| auto *eti = llvm::cast<EnumTypeInfo>(ti); | ||
| auto buffer_holder = PushLocalBuffer((int64_t)data.GetDataStart(), data.GetByteSize()); | ||
| RemoteAddress addr(data.GetDataStart()); | ||
| int case_index; | ||
| if (eti->projectEnumValue(*GetMemoryReader(), addr, &case_index)) | ||
|
|
@@ -2313,85 +2309,87 @@ 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. | ||
| { | ||
| MemoryReaderLocalBufferHolder holder; | ||
| if (use_local_buffer) | ||
| holder = 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; | ||
|
|
||
| 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(); | ||
| if (!reflection_ctx) | ||
| return false; | ||
| auto maybe_addr_or_symbol = | ||
| reflection_ctx->ReadPointer(existential_address); | ||
| if (!maybe_addr_or_symbol) | ||
| return false; | ||
|
|
||
| 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(); | ||
| } | ||
| class_type_or_name.SetCompilerType(dynamic_type); | ||
| address.SetRawAddress(dynamic_address); | ||
| } | ||
|
|
||
| #ifndef NDEBUG | ||
| if (ModuleList::GetGlobalModuleListProperties() | ||
|
|
@@ -2893,8 +2891,9 @@ Value::ValueType SwiftLanguageRuntime::GetValueType( | |
| existential_address = in_value.GetAddressOf(); | ||
| } | ||
|
|
||
| MemoryReaderLocalBufferHolder holder; | ||
| if (use_local_buffer) | ||
| holder = PushLocalBuffer( | ||
| existential_address, | ||
| llvm::expectedToOptional(in_value.GetByteSize()).value_or(0)); | ||
|
|
||
|
|
@@ -2906,8 +2905,6 @@ Value::ValueType SwiftLanguageRuntime::GetValueType( | |
| reflection_ctx->IsValueInlinedInExistentialContainer( | ||
| remote_existential); | ||
|
|
||
|
|
||
| // An error has occurred when trying to read value witness table, | ||
| // default to treating it as pointer. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -246,15 +246,14 @@ SwiftLanguageRuntime::GetDynamicTypeAndAddress_ExistentialRemoteAST( | |
| .value_or(swift::Type()); | ||
| if (!swift_type) | ||
| return {}; | ||
| MemoryReaderLocalBufferHolder holder; | ||
| if (use_local_buffer) | ||
| holder = PushLocalBuffer( | ||
| existential_address, | ||
| llvm::expectedToOptional(in_value.GetByteSize()).value_or(0)); | ||
|
|
||
| auto result = remote_ast.getDynamicTypeAndAddressForExistential( | ||
| remote_existential, swift_type); | ||
|
|
||
| if (!result.isSuccess()) | ||
| return {}; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| SWIFT_SOURCES := main.swift | ||
|
|
||
| include Makefile.rules |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import lldb | ||
| from lldbsuite.test.lldbtest import * | ||
| from lldbsuite.test.decorators import * | ||
| import lldbsuite.test.lldbutil as lldbutil | ||
| import os | ||
|
|
||
|
|
||
| class TestSwiftOriginallyDefinedInPayload(TestBase): | ||
| @swiftTest | ||
| def test(self): | ||
| self.build() | ||
|
|
||
| # rdar://151579199 | ||
| self.runCmd("setting set symbols.swift-validate-typesystem false") | ||
|
|
||
| lldbutil.run_to_source_breakpoint( | ||
| self, "break here", lldb.SBFileSpec("main.swift") | ||
| ) | ||
|
|
||
| self.expect( | ||
| "frame variable c", | ||
| substrs=[ | ||
| "c = 1 value", | ||
| "flexible = {", | ||
| "0 = (value = 100)", | ||
| "1 = (value = 200)", | ||
| " 2 = (value = 300)", | ||
| ], | ||
| ) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clang-format