Skip to content

Commit 0a87525

Browse files
---
yaml --- r: 341221 b: refs/heads/rxwei-patch-1 c: 3ce3f3c h: refs/heads/master i: 341219: d52919e
1 parent 810c91d commit 0a87525

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
10151015
refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
10161016
refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
10171017
refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
1018-
refs/heads/rxwei-patch-1: 6fca968dbdf577a455a39426d35a29a630f76b0f
1018+
refs/heads/rxwei-patch-1: 3ce3f3c628a68ae5a26c3a19bd8b0a949468f21a
10191019
refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
10201020
refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
10211021
refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/Sema/TypeCheckConstraints.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,8 @@ bool TypeChecker::typeCheckForEachBinding(DeclContext *dc, ForEachStmt *stmt) {
28682868
SequenceType = solution.simplifyType(SequenceType);
28692869

28702870
// Perform any necessary conversions of the sequence (e.g. [T]! -> [T]).
2871-
if (solution.coerceToType(expr, SequenceType, cs.getConstraintLocator(expr))) {
2871+
expr = solution.coerceToType(expr, SequenceType, cs.getConstraintLocator(expr));
2872+
if (!expr) {
28722873
return nullptr;
28732874
}
28742875

0 commit comments

Comments
 (0)