---

yaml
---
r: 349055
b: refs/heads/master
c: 162f86f
h: refs/heads/master
i:
  349053: ea929ad
  349051: 95dfed6
  349047: 7a2e379
  349039: 2b2218b
  349023: 5e9bffe
  348991: b58d981
  348927: 6164303

Author: theblixguy

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cb54be26950bce9c135d6461a35f873399e1cb1b
+refs/heads/master: 162f86fdcc96c40bef6411c129f2c7dc6b9f0298
 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

@@ -100,8 +100,6 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
     Inaccessible,
   };
 
-  auto valueVarType = valueVar->getValueInterfaceType();
-
   SmallVector<std::tuple<ConstructorDecl *, NonViableReason, Type>, 2>
       nonviable;
   SmallVector<ConstructorDecl *, 2> viableInitializers;
@@ -183,7 +181,7 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
 
       // The parameter type must be the same as the type of `valueVar` or an
       // autoclosure thereof.
-      if (!paramType->isEqual(valueVarType)) {
+      if (!paramType->isEqual(valueVar->getValueInterfaceType())) {
         nonviable.push_back(std::make_tuple(
             init, NonViableReason::ParameterTypeMismatch, paramType));
         continue;
@@ -214,7 +212,8 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
 
       case NonViableReason::ParameterTypeMismatch:
         init->diagnose(diag::property_wrapper_wrong_initial_value_init,
-                       init->getFullName(), paramType, valueVarType);
+                       init->getFullName(), paramType,
+                       valueVar->getValueInterfaceType());
         valueVar->diagnose(diag::decl_declared_here, valueVar->getFullName());
         break;
       }