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

SILGen: Fix the logic of dynamic replacements for class constructors

Browse Source 
To correctly call designated super class initializers the designated
intializer (and not the allocator) is dynamically replaceable.
Convenience allocators are dynamically replaceable as before.
This commit is contained in:
Arnold Schwaighofer
2019-02-18 13:16:12 -08:00
parent f820c6eb23
commit 8d9b9f328b
12 changed files with 144 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/SIL/SILDeclRef.cpp
View File

@@ -1019,12 +1019,35 @@ unsigned SILDeclRef::getParameterListCount() const {
}
}
static bool isDesignatedConstructorForClass(ValueDecl *decl) {
if (auto *ctor = dyn_cast_or_null<ConstructorDecl>(decl))
if (ctor->getDeclContext()->getSelfClassDecl())
return ctor->isDesignatedInit();
return false;
}
bool SILDeclRef::canBeDynamicReplacement() const {
if (kind == SILDeclRef::Kind::Destroyer)
return false;
if (kind == SILDeclRef::Kind::Initializer)
return isDesignatedConstructorForClass(getDecl());
if (kind == SILDeclRef::Kind::Allocator)
return !isDesignatedConstructorForClass(getDecl());
return true;
}
bool SILDeclRef::isDynamicallyReplaceable() const {
if (isStoredPropertyInitializer())
return false;
// Class allocators are not dynamic replaceable.
if (kind == SILDeclRef::Kind::Allocator &&
isDesignatedConstructorForClass(getDecl()))
return false;
if (kind == SILDeclRef::Kind::Destroyer ||
kind == SILDeclRef::Kind::Initializer ||
(kind == SILDeclRef::Kind::Initializer &&
!isDesignatedConstructorForClass(getDecl())) ||
kind == SILDeclRef::Kind::GlobalAccessor) {
return false;
}