Merge pull request #29943 from CodaFi/cold-storage

[5.2] Refactor AreAllStoredPropertiesDefaultInitableRequest for Property Wrappers

Author: CodaFi

lib/Sema/CodeSynthesis.cpp

@@ -797,23 +797,35 @@ llvm::Expected<bool> AreAllStoredPropertiesDefaultInitableRequest::evaluate(
     // synthesize an initial value (e.g. for an optional) then we suppress
     // generation of the default initializer.
     if (auto pbd = dyn_cast<PatternBindingDecl>(member)) {
-      if (pbd->hasStorage() && !pbd->isStatic()) {
-        for (auto idx : range(pbd->getNumPatternEntries())) {
-          if (pbd->isInitialized(idx)) continue;
+      // Static variables are irrelevant.
+      if (pbd->isStatic()) {
+        continue;
+      }
 
+      for (auto idx : range(pbd->getNumPatternEntries())) {
+        bool HasStorage = false;
+        bool CheckDefaultInitializer = true;
+        pbd->getPattern(idx)->forEachVariable([&](VarDecl *VD) {
           // If one of the bound variables is @NSManaged, go ahead no matter
           // what.
-          bool CheckDefaultInitializer = true;
-          pbd->getPattern(idx)->forEachVariable([&](VarDecl *vd) {
-            if (vd->getAttrs().hasAttribute<NSManagedAttr>())
-              CheckDefaultInitializer = false;
-          });
-        
-          // If we cannot default initialize the property, we cannot
-          // synthesize a default initializer for the class.
-          if (CheckDefaultInitializer && !pbd->isDefaultInitializable())
-            return false;
-        }
+          if (VD->getAttrs().hasAttribute<NSManagedAttr>())
+            CheckDefaultInitializer = false;
+
+          if (VD->hasStorage())
+            HasStorage = true;
+          auto *backing = VD->getPropertyWrapperBackingProperty();
+          if (backing && backing->hasStorage())
+            HasStorage = true;
+        });
+
+        if (!HasStorage) continue;
+
+        if (pbd->isInitialized(idx)) continue;
+
+        // If we cannot default initialize the property, we cannot
+        // synthesize a default initializer for the class.
+        if (CheckDefaultInitializer && !pbd->isDefaultInitializable())
+          return false;
       }
     }
   }

test/SILOptimizer/Inputs/di_property_wrappers_errors_multifile_2.swift

@@ -0,0 +1,19 @@
+@propertyWrapper
+ public struct WrapGod<T> {
+   private var value: T
+
+    public init(wrappedValue: T) {
+     value = wrappedValue
+   }
+
+    public var wrappedValue: T {
+     get { value }
+     set { value = newValue }
+   }
+ }
+
+final class TestCaseRunner {}
+
+struct ContentView { // expected-note {{'init(runner:)' declared here}}
+  @WrapGod var runner: TestCaseRunner
+}

test/SILOptimizer/di_property_wrappers_errors_multifile.swift

@@ -0,0 +1,8 @@
+// rdar://58495602: The order used to matter here. If use compiles before def
+// then you got a DI error. If def compiles before use then you got a linker error.
+
+// RUN: %target-swift-frontend -emit-sil -verify %s %S/Inputs/di_property_wrappers_errors_multifile_2.swift
+// RUN: %target-swift-frontend -emit-sil -verify %S/Inputs/di_property_wrappers_errors_multifile_2.swift %s
+
+let contentView = ContentView() // expected-error {{missing argument for parameter 'runner' in call}}
+