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/ModuleFile.cpp
View File

@@ -613,7 +613,7 @@ void ModuleFile::loadExtensions(NominalTypeDecl *nominal) {
}
void ModuleFile::loadObjCMethods(
ClassDecl *classDecl,
NominalTypeDecl *typeDecl,
ObjCSelector selector,
bool isInstanceMethod,
llvm::TinyPtrVector<AbstractFunctionDecl *> &methods) {
@@ -627,7 +627,7 @@ void ModuleFile::loadObjCMethods(
return;
}
std::string ownerName = Mangle::ASTMangler().mangleNominalType(classDecl);
std::string ownerName = Mangle::ASTMangler().mangleNominalType(typeDecl);
auto results = *known;
for (const auto &result : results) {
// If the method is the wrong kind (instance vs. class), skip it.