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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-07-26 09:09:12 -07:00
parent 57c2ca9544 aa43611dfb
commit bebd1ecbc7
16 changed files with 121 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Serialization/Serialization.cpp
View File

@@ -4796,9 +4796,33 @@ static void collectInterestingNestedDeclarations(
const NominalTypeDecl *nominalParent = nullptr;
for (const Decl *member : members) {
// If there is a corresponding Objective-C method, record it.
auto recordObjCMethod = [&] {
if (isLocal)
return;
if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
if (func->isObjC()) {
if (auto owningClass =
func->getDeclContext()->getAsClassOrClassExtensionContext()) {
Mangle::ASTMangler mangler;
std::string ownerName = mangler.mangleNominalType(owningClass);
assert(!ownerName.empty() && "Mangled type came back empty!");
objcMethods[func->getObjCSelector()].push_back(
std::make_tuple(ownerName,
func->isObjCInstanceMethod(),
S.addDeclRef(func)));
}
}
}
};
if (auto memberValue = dyn_cast<ValueDecl>(member)) {
if (!memberValue->hasName())
if (!memberValue->hasName()) {
recordObjCMethod();
continue;
}
if (memberValue->isOperator()) {
// Add operator methods.
@@ -4834,23 +4858,7 @@ static void collectInterestingNestedDeclarations(
}
// Record Objective-C methods.
if (!isLocal) {
if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
if (func->isObjC()) {
if (auto owningClass =
func->getDeclContext()->getAsClassOrClassExtensionContext()) {
Mangle::ASTMangler mangler;
std::string ownerName = mangler.mangleNominalType(owningClass);
assert(!ownerName.empty() && "Mangled type came back empty!");
objcMethods[func->getObjCSelector()].push_back(
std::make_tuple(ownerName,
func->isObjCInstanceMethod(),
S.addDeclRef(func)));
}
}
}
}
recordObjCMethod();
}
}