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

various parts of the compiler are doggedly trying to figure out

Browse Source 
whether a getter is mutating or a setter is nonmutating, centralize
it into methods on AbstractStorageDecl, NFC.


Swift SVN r28823
This commit is contained in:
Chris Lattner
2015-05-20 05:00:13 +00:00
parent a6f143b87e
commit d6ba8666ca
8 changed files with 71 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/Sema/CodeSynthesis.cpp
View File

@@ -204,33 +204,8 @@ static FuncDecl *createGetterPrototype(AbstractStorageDecl *storage,
TypeLoc::withoutLoc(storageType), storage->getDeclContext());
getter->setImplicit();
// Getters for truly stored properties default to non-mutating.
// Getters for addressed properties follow the ordinary addressor.
auto requiresMutatingGetter = [](const AbstractStorageDecl *storage) {
switch (storage->getStorageKind()) {
case AbstractStorageDecl::Stored:
case AbstractStorageDecl::StoredWithObservers:
return false;
case AbstractStorageDecl::InheritedWithObservers:
return storage->getOverriddenDecl()->getGetter()->isMutating();
case AbstractStorageDecl::Addressed:
case AbstractStorageDecl::AddressedWithObservers:
return storage->getAddressor()->isMutating();
case AbstractStorageDecl::ComputedWithMutableAddress:
case AbstractStorageDecl::StoredWithTrivialAccessors:
case AbstractStorageDecl::AddressedWithTrivialAccessors:
case AbstractStorageDecl::Computed:
llvm_unreachable("shouldn't be synthesizing getter for storage"
" already in this state");
}
llvm_unreachable("bad storage kind!");
};
if (requiresMutatingGetter(storage)) {
if (storage->isGetterMutating())
getter->setMutating();
}
// If the var is marked final, then so is the getter.
if (storage->isFinal())
@@ -268,33 +243,8 @@ static FuncDecl *createSetterPrototype(AbstractStorageDecl *storage,
TypeLoc::withoutLoc(setterRetTy), storage->getDeclContext());
setter->setImplicit();
// Setters for truly stored properties default to mutating.
// Setters for addressed properties follow the mutable addressor.
auto requiresMutatingSetter = [](const AbstractStorageDecl *storage) {
switch (storage->getStorageKind()) {
case AbstractStorageDecl::Stored:
case AbstractStorageDecl::StoredWithObservers:
return storage->isInstanceMember();
case AbstractStorageDecl::InheritedWithObservers:
return storage->getOverriddenDecl()->getSetter()->isMutating();
case AbstractStorageDecl::Addressed:
case AbstractStorageDecl::AddressedWithObservers:
return storage->getMutableAddressor()->isMutating();
case AbstractStorageDecl::ComputedWithMutableAddress:
case AbstractStorageDecl::StoredWithTrivialAccessors:
case AbstractStorageDecl::AddressedWithTrivialAccessors:
case AbstractStorageDecl::Computed:
llvm_unreachable("shouldn't be synthesizing setter for storage"
" already in this state");
}
llvm_unreachable("bad storage kind!");
};
if (requiresMutatingSetter(storage)) {
if (!storage->isSetterNonMutating())
setter->setMutating();
}
// If the var is marked final, then so is the getter.
if (storage->isFinal())