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 pull request #30667 from aschwaighofer/revert_objc_protocol_method_uniquing

Browse Source 
Revert "Merge pull request #30612 from aschwaighofer/irgen_also_uniqu…
This commit is contained in:
Arnold Schwaighofer
2020-03-27 08:36:53 -07:00
committed by GitHub
parent 28315487dc c9d490c5a9
commit 94e9aeb1a2
6 changed files with 38 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/IRGen/GenClass.cpp
View File

@@ -1520,33 +1520,27 @@ namespace {
}
void buildMethod(ConstantArrayBuilder &descriptors,
MethodDescriptor descriptor,
llvm::StringSet<> &uniqueSelectors) {
MethodDescriptor descriptor) {
switch (descriptor.getKind()) {
case MethodDescriptor::Kind::Method:
return buildMethod(descriptors, descriptor.getMethod(),
uniqueSelectors);
return buildMethod(descriptors, descriptor.getMethod());
case MethodDescriptor::Kind::IVarInitializer:
emitObjCIVarInitDestroyDescriptor(IGM, descriptors, getClass(),
descriptor.getImpl(), false,
uniqueSelectors);
descriptor.getImpl(), false);
return;
case MethodDescriptor::Kind::IVarDestroyer:
emitObjCIVarInitDestroyDescriptor(IGM, descriptors, getClass(),
descriptor.getImpl(), true,
uniqueSelectors);
descriptor.getImpl(), true);
return;
}
llvm_unreachable("bad method descriptor kind");
}
void buildMethod(ConstantArrayBuilder &descriptors,
AbstractFunctionDecl *method,
llvm::StringSet<> &uniqueSelectors) {
AbstractFunctionDecl *method) {
auto accessor = dyn_cast<AccessorDecl>(method);
if (!accessor)
return emitObjCMethodDescriptor(IGM, descriptors, method,
uniqueSelectors);
return emitObjCMethodDescriptor(IGM, descriptors, method);
switch (accessor->getAccessorKind()) {
case AccessorKind::Get:
@@ -1615,9 +1609,7 @@ namespace {
namePrefix = "_PROTOCOL_INSTANCE_METHODS_OPT_";
break;
}
llvm::StringSet<> uniqueSelectors;
llvm::Constant *methodListPtr =
buildMethodList(methods, namePrefix, uniqueSelectors);
llvm::Constant *methodListPtr = buildMethodList(methods, namePrefix);
builder.add(methodListPtr);
}
@@ -1643,15 +1635,12 @@ namespace {
void buildExtMethodTypes(ConstantArrayBuilder &array,
ArrayRef<MethodDescriptor> methods) {
assert(isBuildingProtocol());
llvm::StringSet<> uniqueSelectors;
for (auto descriptor : methods) {
assert(descriptor.getKind() == MethodDescriptor::Kind::Method &&
"cannot emit descriptor for non-method");
auto method = descriptor.getMethod();
auto *encodingOrNullIfDuplicate =
getMethodTypeExtendedEncoding(IGM, method, uniqueSelectors);
if (encodingOrNullIfDuplicate != nullptr)
array.add(encodingOrNullIfDuplicate);
array.add(getMethodTypeExtendedEncoding(IGM, method));
}
}
@@ -1663,12 +1652,11 @@ namespace {
///
/// This method does not return a value of a predictable type.
llvm::Constant *buildMethodList(ArrayRef<MethodDescriptor> methods,
StringRef name,
llvm::StringSet<> &uniqueSelectors) {
StringRef name) {
return buildOptionalList(methods, 3 * IGM.getPointerSize(), name,
[&](ConstantArrayBuilder &descriptors,
MethodDescriptor descriptor) {
buildMethod(descriptors, descriptor, uniqueSelectors);
buildMethod(descriptors, descriptor);
});
}