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

remove the TupleSizeMismatch failure mode and diagnose the problem in the mainline

Browse Source 
expr diagnosis stuff, giving us much better diagnostics on the cases in
expr/closure/closures.swift.  This is part #2 of resolving
<rdar://problem/22333281> QoI: improve diagnostic when contextual type of closure disagrees with arguments



Swift SVN r31717
This commit is contained in:
Chris Lattner
2015-09-05 21:38:06 +00:00
parent 877fa0bf84
commit 86b47b8186
8 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Sema/CSSimplify.cpp
View File

@@ -690,15 +690,8 @@ ConstraintSystem::matchTupleTypes(TupleType *tuple1, TupleType *tuple2,
// Equality and subtyping have fairly strict requirements on tuple matching,
// requiring element names to either match up or be disjoint.
if (kind < TypeMatchKind::Conversion) {
if (tuple1->getNumElements() != tuple2->getNumElements()) {
// Record this failure.
if (shouldRecordFailures()) {
recordFailure(getConstraintLocator(locator),
Failure::TupleSizeMismatch, tuple1, tuple2);
}
if (tuple1->getNumElements() != tuple2->getNumElements())
return SolutionKind::Error;
}
for (unsigned i = 0, n = tuple1->getNumElements(); i != n; ++i) {
const auto &elt1 = tuple1->getElement(i);
@@ -764,16 +757,8 @@ ConstraintSystem::matchTupleTypes(TupleType *tuple1, TupleType *tuple2,
// Compute the element shuffles for conversions.
SmallVector<int, 16> sources;
SmallVector<unsigned, 4> variadicArguments;
if (computeTupleShuffle(tuple1, tuple2, sources, variadicArguments)) {
// FIXME: Record why the tuple shuffle couldn't be computed.
if (shouldRecordFailures()) {
if (tuple1->getNumElements() != tuple2->getNumElements()) {
recordFailure(getConstraintLocator(locator),
Failure::TupleSizeMismatch, tuple1, tuple2);
}
}
if (computeTupleShuffle(tuple1, tuple2, sources, variadicArguments))
return SolutionKind::Error;
}
// Check each of the elements.
bool hasVariadic = false;