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

Merge remote-tracking branch 'origin' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Max Moiseev
2015-12-10 10:29:52 -08:00
parent 280feafd10 58fbd1b588
commit d610fa0d1c
338 changed files with 8203 additions and 44228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Sema/CSSimplify.cpp
View File

@@ -444,7 +444,7 @@ matchCallArguments(ArrayRef<CallArgParam> args,
if (param.Variadic)
continue;
// Parameters with defaults can be unfilfilled.
// Parameters with defaults can be unfulfilled.
if (param.HasDefaultArgument)
continue;
@@ -518,29 +518,7 @@ matchCallArguments(ConstraintSystem &cs, TypeMatchKind kind,
ConstraintLocatorBuilder &locator)
: CS(cs), ArgType(argType), ParamType(paramType), Locator(locator) { }
virtual void extraArgument(unsigned argIdx) {
if (!CS.shouldRecordFailures())
return;
CS.recordFailure(CS.getConstraintLocator(Locator),
Failure::ExtraArgument,
argIdx);
}
virtual void missingArgument(unsigned paramIdx) {
if (!CS.shouldRecordFailures())
return;
CS.recordFailure(CS.getConstraintLocator(Locator),
Failure::MissingArgument,
ParamType, paramIdx);
}
virtual void outOfOrderArgument(unsigned argIdx, unsigned prevArgIdx) {
return;
}
virtual bool relabelArguments(ArrayRef<Identifier> newNames) {
bool relabelArguments(ArrayRef<Identifier> newNames) override {
if (!CS.shouldAttemptFixes()) {
// FIXME: record why this failed. We have renaming.
return true;