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

Sema: Force dynamic materializeForSet accessors to be statically dispatched.

Browse Source 
The materializeForSet accessor for a `dynamic` property needs to dynamically invoke the getter and setter of the property in order to allow for runtime modification, so it doesn't need to be dynamically dispatched itself. If the property came from an imported ObjC class, then we can't dynamically dispatch it without polluting the selector namespace. Introduce a new 'ForcedStaticDispatch' bit and set it in order to force `dynamic` materializeForSet accessors to be statically dispatched. (They can't be `final` because it's legal to override a dynamic property.) If the property came from ObjC, register materializeForSet as an external declaration so it gets generated by SIL. Fixes rdar://problem/18706056.

Swift SVN r24930
This commit is contained in:
Joe Groff
2015-02-04 00:46:24 +00:00
parent c48e1bc588
commit b0fabcef7b
5 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Sema/CodeSynthesis.cpp
View File

@@ -328,6 +328,14 @@ static Type getSelfTypeForMaterializeForSetCallback(ASTContext &ctx,
}
}
// True if the storage is dynamic or imported from Objective-C. In these cases,
// we need to emit a static materializeForSet thunk that dynamically dispatches
// to 'get' and 'set', rather than the normal dynamically dispatched
// materializeForSet that peer dispatches to 'get' and 'set'.
static bool needsDynamicMaterializeForSet(AbstractStorageDecl *storage) {
return storage->isDynamic() || storage->hasClangNode();
}
static FuncDecl *createMaterializeForSetPrototype(AbstractStorageDecl *storage,
VarDecl *&bufferParamDecl,
TypeChecker &TC) {
@@ -394,9 +402,22 @@ static FuncDecl *createMaterializeForSetPrototype(AbstractStorageDecl *storage,
materializeForSet->setMutating(setter->isMutating());
materializeForSet->setStatic(setter->isStatic());
// materializeForSet is final if the storage is.
if (storage->isFinal())
makeFinal(ctx, materializeForSet);
// If the storage is dynamic or ObjC-native, we can't add a dynamically-
// dispatched method entry for materializeForSet, so force it to be
// statically dispatched. ("final" would be inappropriate because the
// property can still be overridden.)
if (needsDynamicMaterializeForSet(storage))
materializeForSet->setForcedStaticDispatch(true);
// If the property came from ObjC, we need to register this as an external
// definition to be compiled.
if (storage->hasClangNode())
TC.Context.addedExternalDecl(materializeForSet);
return materializeForSet;
}
@@ -1115,7 +1136,7 @@ static void synthesizeComputedMaterializeForSet(FuncDecl *materializeForSet,
AccessSemantics semantics;
// If the storage is dynamic, we must dynamically redispatch through the
// accessor. Otherwise, we can do a direct peer access.
if (storage->isDynamic())
if (needsDynamicMaterializeForSet(storage))
semantics = AccessSemantics::Ordinary;
else
semantics = AccessSemantics::DirectToAccessor;
@@ -1375,7 +1396,7 @@ void swift::synthesizeMaterializeForSet(FuncDecl *materializeForSet,
// Only variables can be Stored, and only variables can be weak/unowned.
auto var = cast<VarDecl>(storage);
if (var->getType()->is<ReferenceStorageType>()
|| var->isDynamic()) {
|| needsDynamicMaterializeForSet(var)) {
synthesizeComputedMaterializeForSet(materializeForSet, storage,
bufferDecl, TC);
return;