---

yaml
---
r: 349172
b: refs/heads/master-next
c: b15ef15
h: refs/heads/master

Author: xedin

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 4203c2f9f3fd592c2c927b65d99fbcff46d7f237
+refs/heads/master-next: b15ef15a60c74f37bdf9098aa5fd79eb9ce575b8
 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/CSDiag.cpp

@@ -2211,7 +2211,7 @@ class ArgumentMatcher : public MatchCallArgumentListener {
     Diagnosed = true;
   }
 
-  void missingArgument(unsigned missingParamIdx) override {
+  Optional<unsigned> missingArgument(unsigned missingParamIdx) override {
     auto &param = Parameters[missingParamIdx];
     Identifier name = param.getLabel();
 
@@ -2341,6 +2341,7 @@ class ArgumentMatcher : public MatchCallArgumentListener {
                   candidate.getDecl()->getFullName());
 
     Diagnosed = true;
+    return None;
   }
 
   bool isPropertyWrapperImplicitInit() {

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

@@ -36,7 +36,10 @@ MatchCallArgumentListener::~MatchCallArgumentListener() { }
 
 void MatchCallArgumentListener::extraArgument(unsigned argIdx) { }
 
-void MatchCallArgumentListener::missingArgument(unsigned paramIdx) { }
+Optional<unsigned>
+MatchCallArgumentListener::missingArgument(unsigned paramIdx) {
+  return None;
+}
 
 bool MatchCallArgumentListener::missingLabel(unsigned paramIdx) { return true; }
 bool MatchCallArgumentListener::extraneousLabel(unsigned paramIdx) {

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

@@ -284,8 +284,9 @@ CalleeCandidateInfo::ClosenessResultTy CalleeCandidateInfo::evaluateCloseness(
     void extraArgument(unsigned argIdx) override {
       result = CC_ArgumentCountMismatch;
     }
-    void missingArgument(unsigned paramIdx) override {
+    Optional<unsigned> missingArgument(unsigned paramIdx) override {
       result = CC_ArgumentCountMismatch;
+      return None;
     }
     bool missingLabel(unsigned paramIdx) override {
       result = CC_ArgumentLabelMismatch;

branches/master-next/lib/Sema/ConstraintSystem.h

@@ -3858,7 +3858,7 @@ class MatchCallArgumentListener {
   /// indices.
   ///
   /// \param paramIdx The index of the parameter that is missing an argument.
-  virtual void missingArgument(unsigned paramIdx);
+  virtual Optional<unsigned> missingArgument(unsigned paramIdx);
 
   /// Indicate that there was no label given when one was expected by parameter.
   ///