Sema: Simplify finalizeType() by using getStoredProperties()

Continue gutting finalizeType() by using our new request to
synthesize the backing storage for lazy properties and
property wrappers.

Author: slavapestov

lib/Sema/CodeSynthesis.cpp

@@ -2056,9 +2056,6 @@ static void finishProtocolStorageImplInfo(AbstractStorageDecl *storage) {
 }
 
 static void finishLazyVariableImplInfo(VarDecl *var) {
-  // FIXME: Remove this once getStoredProperties() is a request
-  (void) var->getLazyStorageProperty();
-
   // If there are already accessors, something is invalid; bail out.
   if (!var->getImplInfo().isSimpleStored())
     return;
@@ -2074,6 +2071,9 @@ static bool allPropertyWrapperValueSettersAreAccessible(VarDecl *var) {
   for (unsigned i : indices(wrapperAttrs)) {
     auto wrapperInfo = var->getAttachedPropertyWrapperTypeInfo(i);
     auto valueVar = wrapperInfo.valueVar;
+    // Only nullptr with invalid code.
+    if (!valueVar)
+      return false;
     if (!valueVar->isSettable(nullptr) ||
         !valueVar->isSetterAccessibleFrom(innermostDC))
       return false;
@@ -2083,10 +2083,6 @@ static bool allPropertyWrapperValueSettersAreAccessible(VarDecl *var) {
 }
 
 static void finishPropertyWrapperImplInfo(VarDecl *var) {
-  auto backingVar = var->getPropertyWrapperBackingProperty();
-  if (!backingVar || backingVar->isInvalid())
-    return;
-
   auto parentSF = var->getDeclContext()->getParentSourceFile();
   bool wrapperSetterIsUsable =
     var->getSetter() ||

lib/Sema/TypeCheckDecl.cpp

@@ -2875,6 +2875,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TC.addImplicitConstructors(SD);
 
+    // Force lowering of stored properties.
+    (void) SD->getStoredProperties();
+
     for (Decl *Member : SD->getMembers())
       visit(Member);
 
@@ -3002,6 +3005,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
                        DescriptiveDeclKind::Class, path);
     }
 
+    // Force lowering of stored properties.
+    (void) CD->getStoredProperties();
+
     for (Decl *Member : CD->getMembers()) {
       visit(Member);
     }
@@ -4522,31 +4528,16 @@ static void finalizeType(TypeChecker &TC, NominalTypeDecl *nominal) {
     CD->addImplicitDestructor();
   }
 
+  // Force lowering of stored properties.
+  (void) nominal->getStoredProperties();
+
   for (auto *D : nominal->getMembers()) {
     auto VD = dyn_cast<ValueDecl>(D);
     if (!VD)
       continue;
 
-    if (!shouldValidateMemberDuringFinalization(nominal, VD))
-      continue;
-
-    TC.DeclsToFinalize.insert(VD);
-
-    // The only thing left to do is synthesize storage for lazy variables
-    // and property wrappers.
-    auto *prop = dyn_cast<VarDecl>(D);
-    if (!prop)
-      continue;
-
-    if (prop->getAttrs().hasAttribute<LazyAttr>() && !prop->isStatic() &&
-        (!prop->getGetter() || !prop->getGetter()->hasBody())) {
-      (void) prop->getLazyStorageProperty();
-    }
-
-    // Ensure that we create the backing variable for a wrapped property.
-    if (prop->hasAttachedPropertyWrapper()) {
-      (void) prop->getPropertyWrapperBackingProperty();
-    }
+    if (shouldValidateMemberDuringFinalization(nominal, VD))
+      TC.DeclsToFinalize.insert(VD);
   }
 
   if (auto *CD = dyn_cast<ClassDecl>(nominal)) {