[20250402][LLDB] Fix build errors #10599
Conversation
| @@ -1269,7 +1269,7 @@ TypeSystemSwiftTypeRef::Canonicalize(swift::Demangle::Demangler &dem, | |||
| if (node->getKind() != Node::Kind::BoundGenericTypeAlias && | |||
| node->getKind() != Node::Kind::TypeAlias) | |||
| // Resolve any type aliases in the resolved type. | |||
| return GetCanonicalNode(dem, node); | |||
| return GetCanonicalNode(dem, node, flavor); | |||
There was a problem hiding this comment.
This change surprises me. @augusto2112 Were we missing a cherry-pick on next?
There was a problem hiding this comment.
Cannot find one. This line was added in 6c485cd.
There was a problem hiding this comment.
So the flavor thing landed on next and this code was cherry-picked from the old stable branch to next after that and presumably not tested for Swift.
There was a problem hiding this comment.
If I'm following commits through properly, this was #9883 on swift/release/6.1. There's a merge of that to stable/20240723 in d53ecfc (not sure the PR for this one though). And also cherry-picked to next in #9913, but the next cherry-pick didn't fix up the GetCanonicalNode call.
TLDR: I think everything that needs to be cherry-picked, is, and this is just a fix-up that wasn't made on next.
| @@ -2905,8 +2905,7 @@ std::optional<SwiftNominalType> GetSwiftClass(ValueObject &valobj, | |||
|
|
|||
| auto isa_load_addr = descriptor_sp->GetISA(); | |||
| Address isa; | |||
| const auto §ions = objc_runtime.GetTargetRef().GetSectionLoadList(); | |||
| if (!sections.ResolveLoadAddress(isa_load_addr, isa)) | |||
| if (!objc_runtime.GetTargetRef().ResolveLoadAddress(isa_load_addr, isa)) | |||
There was a problem hiding this comment.
Is this forwarding the call to the SectionLoadList?
lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
Outdated
Show resolved
Hide resolved
lldb/source/Plugins/ExpressionParser/Swift/SwiftREPLMaterializer.cpp
Outdated
Show resolved
Hide resolved
AnthonyLatsis
force-pushed
the
rebranch-fixes
branch
from
231cd54 to
bef405b
Compare
…e to return llvm::Expected (llvm#129601)" This patch pushes the error handling boundary for the GetBitSize() methods from Runtime into the Type and CompilerType APIs. This makes it easier to diagnose problems thanks to more meaningful error messages being available. GetBitSize() is often the first thing LLDB asks about a type, so this method is particularly important for a better user experience. rdar://145667239 (cherry picked from commit 878a64f) (cherry picked from commit 642dcd7)
We lost a conditionally used variable in 15070b3.
We accidentally redefined a function in 305e024.
…r type changed) Per 979c275 (llvm-project).
…ype changed) Per f9f0ae1.
…meter type changed) Per 39b2979.
AnthonyLatsis
force-pushed
the
rebranch-fixes
branch
from
bef405b to
138d661
Compare
…tKind::AnyModule` removal Per 212950f.
AnthonyLatsis
force-pushed
the
rebranch-fixes
branch
from
138d661 to
0b6504a
Compare
|
@swift-ci please test |
No description provided.