---

yaml
---
r: 349053
b: refs/heads/master
c: e23b373
h: refs/heads/master
i:
  349051: 95dfed6

Author: theblixguy

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 370f47c27a80a12e8ddb73c586782825cd883c22
+refs/heads/master: e23b37383059ac43f64906e60eab99236f6dbadb
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -125,34 +125,28 @@ findSuitableWrapperInit(ASTContext &ctx, NominalTypeDecl *nominal,
       continue;
 
     ParamDecl *argumentParam = nullptr;
-    bool allArgsDefault = true;
+    bool hasExtraneousParam = false;
     // Check whether every parameter meets one of the following criteria:
     //   (1) The parameter has a default argument, or
     //   (2) The parameter has the given argument label.
     for (auto param : *init->getParameters()) {
       // Recognize the first parameter with the requested argument label.
-      if (param->getArgumentName() == argumentLabel && !argumentParam) {
+      if (!argumentLabel.empty() && param->getArgumentName() == argumentLabel &&
+          !argumentParam) {
         argumentParam = param;
         continue;
       }
 
-      if (param->isDefaultArgument()) {
-        allArgsDefault &= true;
+      if (param->isDefaultArgument())
         continue;
-      } else {
-        // Forget we had a match.
-        allArgsDefault = false;
-        argumentParam = nullptr;
-        break;
-      }
-    }
 
-    if (initKind != PropertyWrapperInitKind::Default && !argumentParam)
-      continue;
+      // Skip this init as the param doesn't meet the above criteria
+      hasExtraneousParam = true;
+      break;
+    }
 
-    if (initKind == PropertyWrapperInitKind::Default && !allArgsDefault) {
+    if (hasExtraneousParam)
       continue;
-    }
 
     // Failable initializers cannot be used.
     if (init->isFailable()) {