Skip to content

[next] Cherry-pick Swift-specific LLDB adjustments #10618

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.

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

Merged
merged 17 commits into from
May 5, 2025
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
18227a6
[stable/20250402] Cherry-pick "[lldb] Upgrade CompilerType::GetBitSiz…
adrian-prantl Mar 6, 2025
b250056
[LLDB] Fix faulty merge
AnthonyLatsis Apr 30, 2025
dd2b5a4
[LLDB] Swift: Fix faulty cherry-pick
AnthonyLatsis Apr 30, 2025
9d4915e
[LLDB] Swift: Adjust use of `llvm::Module::setTargetTriple` (paramete…
AnthonyLatsis Apr 30, 2025
5e9fb22
[LLDB] Swift: Refactor method override (parameter type changed)
AnthonyLatsis Apr 30, 2025
425218e
[LLDB] Swift: Adjust method override (parameter type changed)
AnthonyLatsis Apr 30, 2025
813e73f
[LLDB] Swift: Adjust method override (parameter type changed)
AnthonyLatsis Apr 30, 2025
12b19a4
[LLDB] Swift: Switch from `UnwindPlan::RowSP` to `UnwindPlan::Row`
AnthonyLatsis Apr 30, 2025
a5fa504
[LLDB] Swift: Adjust call to `TypeSystemClang::GetMetadata` (return t…
AnthonyLatsis Apr 30, 2025
68e65f8
[LLDB] Swift: Add missing `TypeSummaryImpl::GetName` implementations
AnthonyLatsis Apr 30, 2025
c30cc8f
[LLDB] Swift: Adjust includes of moved Clang headers
AnthonyLatsis May 1, 2025
59d6a25
[LLDB] Swift: Adjust calls to moved & renamed methods
AnthonyLatsis May 1, 2025
e8f5534
[LLDB] Swift: s/DWARFRangeList/llvm::DWARFAddressRangeVector
AnthonyLatsis May 1, 2025
c9f9633
[LLDB] Swift: Adjust call to `Function::GetStartLineSourceInfo` (para…
AnthonyLatsis May 1, 2025
5c9b85d
[LLDB] Swift: Refactor call to now `protected` method
AnthonyLatsis May 1, 2025
8b90bf4
[LLDB] Swift: Add missing argument to call
AnthonyLatsis May 1, 2025
4bf37fd
[LLDB] Swift: Refactor `TypeSystemSwiftTypeRef` after `CompilerContex…
AnthonyLatsis May 1, 2025
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
Prev Previous commit
Next Next commit
[LLDB] Swift: Fix faulty cherry-pick
We accidentally redefined a function in
305e024.

(cherry picked from commit 8670119)
  • Loading branch information
AnthonyLatsis authored and bnbarham committed May 3, 2025
commit dd2b5a466e2ab3678ba5b988d0f5a70c1abd1e19
18 changes: 0 additions & 18 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1637,24 +1637,6 @@ swift::Demangle::NodePointer TypeSystemSwiftTypeRef::GetDemangleTreeForPrinting(
return GetNodeForPrintingImpl(dem, node, flavor, resolve_objc_module);
}

static bool ProtocolCompositionContainsSingleObjcProtocol(
swift::Demangle::NodePointer node) {
// Kind=ProtocolList
// Kind=TypeList
// Kind=Type
// Kind=Protocol
// Kind=Module, text="__C"
// Kind=Identifier, text="SomeIdentifier"
if (node->getKind() != Node::Kind::ProtocolList)
return false;
NodePointer type_list = node->getFirstChild();
if (type_list->getKind() != Node::Kind::TypeList ||
type_list->getNumChildren() != 1)
return false;
NodePointer type = type_list->getFirstChild();
return Contains(type, Node::Kind::Module, swift::MANGLING_MODULE_OBJC);
}

/// Determine wether this demangle tree contains a node of kind \c kind and with
/// text \c text (if provided).
static bool Contains(swift::Demangle::NodePointer node,
Expand Down