Sema: Remove addExpectedOpaqueAccessorsToStorage()

Author: slavapestov

lib/Sema/CSApply.cpp

@@ -4039,7 +4039,6 @@ namespace {
         method = func;
       } else if (auto var = dyn_cast<VarDecl>(foundDecl)) {
         // Properties.
-        addExpectedOpaqueAccessorsToStorage(var);
 
         // If this isn't a property on a type, complain.
         if (!var->getDeclContext()->isTypeContext()) {

lib/Sema/CodeSynthesis.cpp

@@ -1293,13 +1293,6 @@ SynthesizeAccessorRequest::evaluate(Evaluator &evaluator,
   }
 }
 
-void swift::addExpectedOpaqueAccessorsToStorage(AbstractStorageDecl *storage) {
-  storage->visitExpectedOpaqueAccessors([&](AccessorKind kind) {
-    // Force synthesis if necessary.
-    (void) storage->getSynthesizedAccessor(kind);
-  });
-}
-
 /// Synthesize the body of a setter which just delegates to a mutable
 /// addressor.
 static std::pair<BraceStmt *, bool>
@@ -1717,7 +1710,6 @@ static VarDecl *synthesizePropertyWrapperStorageWrapperProperty(
     property->setImplInfo(StorageImplInfo::getMutableComputed());
   else
     property->setImplInfo(StorageImplInfo::getImmutableComputed());
-  addExpectedOpaqueAccessorsToStorage(property);
 
   var->getAttrs().add(
       new (ctx) ProjectedValuePropertyAttr(name, SourceLoc(), SourceRange(),

lib/Sema/CodeSynthesis.h

@@ -45,9 +45,6 @@ class ObjCReason;
 // Implemented in TypeCheckerOverride.cpp
 bool checkOverrides(ValueDecl *decl);
 
-// These are implemented in CodeSynthesis.cpp.
-void addExpectedOpaqueAccessorsToStorage(AbstractStorageDecl *storage);
-
 /// Describes the kind of implicit constructor that will be
 /// generated.
 enum class ImplicitConstructorKind {

lib/Sema/TypeCheckDecl.cpp

@@ -2528,12 +2528,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Compute these requests in case they emit diagnostics.
     (void) VD->isGetterMutating();
     (void) VD->isSetterMutating();
-
-    // Retrieve the backing property of a wrapped property.
     (void) VD->getPropertyWrapperBackingProperty();
-
-    // Set up accessors, also lowering lazy and @NSManaged properties.
-    addExpectedOpaqueAccessorsToStorage(VD);
+    (void) VD->getImplInfo();
 
     // Add the '@_hasStorage' attribute if this property is stored.
     if (VD->hasStorage() && !VD->getAttrs().hasAttribute<HasStorageAttr>())
@@ -2542,9 +2538,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Reject cases where this is a variable that has storage but it isn't
     // allowed.
     if (VD->hasStorage()) {
-      // Stored properties in protocols are diagnosed in
-      // addExpectedOpaqueAccessorsToStorage(), to ensure they run when a
-      // protocol requirement is validated but not type checked.
+      // Note: Stored properties in protocols are diagnosed in
+      // finishProtocolStorageImplInfo().
 
       // Enums and extensions cannot have stored instance properties.
       // Static stored properties are allowed, with restrictions
@@ -2615,8 +2610,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TC.checkDeclAttributes(VD);
 
-    addExpectedOpaqueAccessorsToStorage(VD);
-
     if (VD->getDeclContext()->getSelfClassDecl()) {
       checkDynamicSelfType(VD, VD->getValueInterfaceType());
 
@@ -2861,8 +2854,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Compute these requests in case they emit diagnostics.
     (void) SD->isGetterMutating();
     (void) SD->isSetterMutating();
-
-    addExpectedOpaqueAccessorsToStorage(SD);
+    (void) SD->getImplInfo();
 
     if (SD->getAttrs().hasAttribute<DynamicReplacementAttr>()) {
       TC.checkDynamicReplacementAttribute(SD);

lib/Sema/TypeCheckDeclOverride.cpp

@@ -1879,8 +1879,6 @@ OverriddenDeclsRequest::evaluate(Evaluator &evaluator, ValueDecl *decl) const {
     SmallVector<OverrideMatch, 2> matches;
     for (auto overridden : overridingASD->getOverriddenDecls()) {
       auto baseASD = cast<AbstractStorageDecl>(overridden);
-      addExpectedOpaqueAccessorsToStorage(baseASD);
-
       auto kind = accessor->getAccessorKind();
 
       // If the base doesn't consider this an opaque accessor,

test/attr/attr_objc.swift

@@ -845,7 +845,7 @@ class infer_instanceVar1 {
   }
 
   var observingAccessorsVar1: Int {
-  // CHECK: @objc @_hasStorage var observingAccessorsVar1: Int {
+  // CHECK: @_hasStorage @objc var observingAccessorsVar1: Int {
     willSet {}
     // CHECK-NEXT: {{^}} @objc get
     didSet {}