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

[SR-13239] Adjust error message to split inferrence source into notes

Browse Source
This commit is contained in:
Luciano Almeida
2021-06-18 10:52:38 -03:00
parent 1903681554
commit 0e8b7ceb18
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/ConstraintSystem.cpp
View File

@@ -3787,7 +3787,7 @@ static bool diagnoseContextualFunctionCallGenericAmbiguity(
return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
};
llvm::SmallVector<ClosureExpr *, 4> closureArguments;
llvm::SmallVector<ClosureExpr *, 2> closureArguments;
// A single closure argument.
if (auto *closure =
getAsExpr<ClosureExpr>(AE->getArg()->getSemanticsProvidingExpr())) {
@@ -3837,7 +3837,7 @@ static bool diagnoseContextualFunctionCallGenericAmbiguity(
return true;
})) {
if (genericParamInferredTypes.size() <= 1)
if (genericParamInferredTypes.size() != 2)
return false;
auto &DE = cs.getASTContext().Diags;
@@ -3848,9 +3848,16 @@ static bool diagnoseContextualFunctionCallGenericAmbiguity(
[&](Type argType) { OS << "'" << argType << "'"; },
[&OS] { OS << " vs. "; });
DE.diagnose(AE->getLoc(),
diag::conflicting_inferred_generic_parameter_result_and_closure,
DE.diagnose(AE->getLoc(), diag::conflicting_arguments_for_generic_parameter,
GP, OS.str());
DE.diagnose(AE->getLoc(),
diag::generic_parameter_inferred_from_result_context, GP,
genericParamInferredTypes.back());
DE.diagnose(closureArguments.front()->getStartLoc(),
diag::generic_parameter_inferred_from_closure, GP,
genericParamInferredTypes.front());
return true;
}
return false;