Skip to content

Commit d50a099

Browse files
committed
---
yaml --- r: 349054 b: refs/heads/master c: cb54be2 h: refs/heads/master
1 parent ea929ad commit d50a099

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e23b37383059ac43f64906e60eab99236f6dbadb
2+
refs/heads/master: cb54be26950bce9c135d6461a35f873399e1cb1b
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckPropertyWrapper.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
100100
Inaccessible,
101101
};
102102

103+
auto valueVarType = valueVar->getValueInterfaceType();
104+
103105
SmallVector<std::tuple<ConstructorDecl *, NonViableReason, Type>, 2>
104106
nonviable;
105107
SmallVector<ConstructorDecl *, 2> viableInitializers;
@@ -212,8 +214,7 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
212214

213215
case NonViableReason::ParameterTypeMismatch:
214216
init->diagnose(diag::property_wrapper_wrong_initial_value_init,
215-
init->getFullName(), paramType,
216-
valueVar->getValueInterfaceType());
217+
init->getFullName(), paramType, valueVarType);
217218
valueVar->diagnose(diag::decl_declared_here, valueVar->getFullName());
218219
break;
219220
}

0 commit comments

Comments
 (0)