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: Refactor away maybeAddAccessorsToStorage()

Browse Source 
This centralizes the decision to add or not to add accessors in one place.
This commit is contained in:
Slava Pestov
2019-07-26 23:23:31 -04:00
parent 8bdbc5c793
commit 37f0d6a613
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Sema/CodeSynthesis.cpp
View File

@@ -1317,13 +1317,9 @@ static void addOpaqueAccessorToStorage(AbstractStorageDecl *storage,
}
}
static void addExpectedOpaqueAccessorsToStorage(AbstractStorageDecl *storage,
ASTContext &ctx) {
// Nameless vars from interface files should not have any accessors.
// TODO: Replace this check with a broader check that all storage decls
// from interface files have all their accessors up front.
if (storage->getBaseName().empty())
return;
void swift::addExpectedOpaqueAccessorsToStorage(AbstractStorageDecl *storage) {
auto &ctx = storage->getASTContext();
storage->visitExpectedOpaqueAccessors([&](AccessorKind kind) {
// If the accessor is already present, there's nothing to do.
if (storage->getAccessor(kind))
@@ -1782,7 +1778,7 @@ static VarDecl *synthesizePropertyWrapperStorageWrapperProperty(
property->setImplInfo(StorageImplInfo::getMutableComputed());
else
property->setImplInfo(StorageImplInfo::getImmutableComputed());
addExpectedOpaqueAccessorsToStorage(property, ctx);
addExpectedOpaqueAccessorsToStorage(property);
var->getAttrs().add(
new (ctx) ProjectedValuePropertyAttr(name, SourceLoc(), SourceRange(),
@@ -2061,7 +2057,7 @@ static bool wouldBeCircularSynthesis(AbstractStorageDecl *storage,
void swift::triggerAccessorSynthesis(TypeChecker &TC,
AbstractStorageDecl *storage) {
maybeAddAccessorsToStorage(storage);
addExpectedOpaqueAccessorsToStorage(storage);
// Trigger accessor synthesis.
storage->visitExpectedOpaqueAccessors([&](AccessorKind kind) {
@@ -2418,6 +2414,12 @@ StorageImplInfoRequest::evaluate(Evaluator &evaluator,
llvm::Expected<bool>
RequiresOpaqueAccessorsRequest::evaluate(Evaluator &evaluator,
VarDecl *var) const {
// Nameless vars from interface files should not have any accessors.
// TODO: Replace this check with a broader check that all storage decls
// from interface files have all their accessors up front.
if (var->getBaseName().empty())
return false;
// Computed properties always require opaque accessors.
if (!var->getImplInfo().isSimpleStored())
return true;
@@ -2490,15 +2492,6 @@ RequiresOpaqueModifyCoroutineRequest::evaluate(Evaluator &evaluator,
return true;
}
/// Try to add the appropriate accessors required a storage declaration.
/// This needs to be idempotent.
void swift::maybeAddAccessorsToStorage(AbstractStorageDecl *storage) {
if (storage->requiresOpaqueAccessors()) {
auto &ctx = storage->getASTContext();
addExpectedOpaqueAccessorsToStorage(storage, ctx);
}
}
static std::pair<BraceStmt *, bool>
synthesizeGetterBody(AccessorDecl *getter, ASTContext &ctx) {
auto storage = getter->getStorage();