averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Speculatively revert "[Type checker] Eliminate the 'literalConformanceProto' state on type variables."

Browse Source 
This reverts commit 6bdd9cfae5. This
commit *appears* to be breaking something in Dollar involving
inference with array literals and 'nil'; pull it back for more
investigation.
This commit is contained in:
Doug Gregor
2016-10-12 09:20:16 -07:00
parent 7ba11dd479
commit 01fa24cc9b
7 changed files with 74 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Sema/CSDiag.cpp
View File

@@ -2920,8 +2920,7 @@ bool FailureDiagnosis::diagnoseGeneralConversionFailure(Constraint *constraint){
// If simplification has turned this into the same types, then this isn't the
// broken constraint that we're looking for.
if (fromType->isEqual(toType) &&
constraint->getKind() != ConstraintKind::ConformsTo &&
constraint->getKind() != ConstraintKind::LiteralConformsTo)
constraint->getKind() != ConstraintKind::ConformsTo)
return false;