---

yaml
---
r: 348583
b: refs/heads/master
c: d93e6f4
h: refs/heads/master
i:
  348581: d1cbc14
  348579: 4ac5bd4
  348575: cee0d57

Author: swift-ci

[refs]

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

trunk/lib/Sema/TypeCheckConstraints.cpp

@@ -2633,7 +2633,7 @@ bool TypeChecker::typeCheckBinding(Pattern *&pattern, Expr *&initializer,
                           emptyLocator);
         return propertyType;
       }
-      
+
       // Otherwise, compute the wrapped value type directly.
       return computeWrappedValueType(wrappedVar, initType);
     }
@@ -2654,10 +2654,10 @@ bool TypeChecker::typeCheckBinding(Pattern *&pattern, Expr *&initializer,
         // is the initialization of the property wrapper instance.
         initType = cs.getType(expr);
 
-        // Add a conversion constraint between the pattern type and the
+        // Add an equal constraint between the pattern type and the
         // property wrapper's "value" type.
-        cs.addConstraint(ConstraintKind::Conversion, patternType,
-                         getPatternInitType(&cs), Locator, /*isFavored*/true);
+        cs.addConstraint(ConstraintKind::Equal, patternType,
+                         getPatternInitType(&cs), Locator, /*isFavored*/ true);
       } else {
         // The initializer type is the type of the pattern.
         initType = patternType;

trunk/test/decl/var/property_wrappers.swift

@@ -1683,3 +1683,17 @@ final class SR_11478_C2 {
   @SR_11478_W class var bool2: Bool = true // expected-error {{class stored properties not supported in classes; did you mean 'static'?}}
   @SR_11478_W class final var bool3: Bool = true // expected-error {{class stored properties not supported in classes; did you mean 'static'?}}
 }
+
+// SR-11381
+
+@propertyWrapper
+struct SR_11381_W<T> {
+  init(wrappedValue: T) {}
+  var wrappedValue: T {
+    fatalError()
+  }
+}
+
+struct SR_11381_S {
+  @SR_11381_W var foo: Int = nil // expected-error {{'nil' is not compatible with expected argument type 'Int'}}
+}