---

yaml
---
r: 349049
b: refs/heads/master
c: 22bbaea
h: refs/heads/master
i:
  349047: 7a2e379

Author: theblixguy

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ab31a0d3e9a6f68184bf2e2663b60deaf2af17fa
+refs/heads/master: 22bbaea606b2dfffd65650deda35662cf701177a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -208,24 +208,21 @@ static ConstructorDecl *findDefaultInit(ASTContext &ctx,
   nominal->lookupQualified(nominal, initName, NL_QualifiedDefault, decls);
   for (const auto &decl : decls) {
     auto init = dyn_cast<ConstructorDecl>(decl);
-    if (!init || init->getDeclContext() != nominal)
+    if (!init || init->getDeclContext() != nominal || init->isGeneric())
       continue;
 
+    assert(init->hasParameterList());
     // A constructor which does not have any parameters or where all the
     // parameters have a default argument can be used to default initialize
     // the property wrapper type.
-    assert(init->hasParameterList());
-    auto hasParams = init->getParameters()->size() > 0;
-    auto allParamsHaveDefaultArg = false;
-
-    if (hasParams) {
-      allParamsHaveDefaultArg = llvm::all_of(
-          init->getParameters()->getArray(),
-          [](const ParamDecl *decl) { return decl->isDefaultArgument(); });
-    }
-
-    // Skip synthesized default initializers
-    if (!hasParams || (allParamsHaveDefaultArg && !init->isImplicit())) {
+    //
+    // A constructor with no parameters will satisfy the check below.
+    bool allParamsHaveDefaultArg = llvm::all_of(
+        init->getParameters()->getArray(),
+        [](const ParamDecl *decl) { return decl->isDefaultArgument(); });
+
+    // Only add non-synthesized initializers.
+    if (allParamsHaveDefaultArg && !init->isImplicit()) {
       defaultValueInitializers.push_back(init);
     }
   }

trunk/test/SILOptimizer/di_property_wrappers_errors.swift

@@ -46,3 +46,23 @@ struct IntStructWithClassWrapper {
   } // expected-error{{return from initializer without initializing all stored properties}}
   // expected-note@-1{{'self.wrapped' not initialized}}  
 }
+
+// SR_11477
+
+@propertyWrapper
+struct SR_11477_W {
+  let name: String
+
+  init<T: ExpressibleByIntegerLiteral>(_ value: T = 0) {
+    self.name = "Init"
+  }
+
+  var wrappedValue: Int {
+    get { return 0 }
+  }
+}
+
+struct SR_11477_S {
+  @SR_11477_W var foo: Int
+  init() {} // expected-error {{return from initializer without initializing all stored properties}} expected-note {{'self.foo' not initialized}}
+}