averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2022-06-17 10:15:14 -07:00
parent 99b7888cc7 6089ab1be3
commit 55000f53be
42 changed files with 443 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -5539,10 +5539,10 @@ static void collectInterestingNestedDeclarations(
if (isLocal)
return;
if (auto owningClass = func->getDeclContext()->getSelfClassDecl()) {
if (auto owningType = func->getDeclContext()->getSelfNominalTypeDecl()) {
if (func->isObjC()) {
Mangle::ASTMangler mangler;
std::string ownerName = mangler.mangleNominalType(owningClass);
std::string ownerName = mangler.mangleNominalType(owningType);
assert(!ownerName.empty() && "Mangled type came back empty!");
objcMethods[func->getObjCSelector()].push_back(