---

yaml
---
r: 349176
b: refs/heads/master-next
c: b8528cd
h: refs/heads/master

Author: xedin

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 881f521958be6f19e1d3ef505765f77840b026b4
+refs/heads/master-next: b8528cd5750a95779411863747f4babbc8072164
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/CSSimplify.cpp

@@ -575,6 +575,7 @@ matchCallArguments(ArrayRef<AnyFunctionType::Param> args,
 
   // If we have any unfulfilled parameters, check them now.
   if (haveUnfulfilledParams) {
+    bool hasSynthesizedArgs = false;
     for (paramIdx = 0; paramIdx != numParams; ++paramIdx) {
       // If we have a binding for this parameter, we're done.
       if (!parameterBindings[paramIdx].empty())
@@ -590,16 +591,19 @@ matchCallArguments(ArrayRef<AnyFunctionType::Param> args,
       if (paramInfo.hasDefaultArgument(paramIdx))
         continue;
 
-      if (potentiallyOutOfOrder)
-        return true;
-
       if (auto newArgIdx = listener.missingArgument(paramIdx)) {
         parameterBindings[paramIdx].push_back(*newArgIdx);
+        hasSynthesizedArgs = true;
         continue;
       }
 
       return true;
     }
+
+    // If all of the missing arguments have been synthesized,
+    // let's stop since we have found the problem.
+    if (hasSynthesizedArgs)
+      return false;
   }
 
   // If any arguments were provided out-of-order, check whether we have