---

yaml
---
r: 344829
b: refs/heads/master
c: b33a46b
h: refs/heads/master
i:
  344827: b1145d7

Author: swift-ci

[refs]

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

trunk/lib/Parse/ParsePattern.cpp

@@ -429,6 +429,14 @@ mapParsedParameters(Parser &parser,
                                      paramNameLoc, paramName,
                                      parser.CurDeclContext);
     param->getAttrs() = paramInfo.Attrs;
+
+    auto setInvalid = [&]{
+      if (param->isInvalid())
+        return;
+      param->getTypeLoc().setInvalidType(ctx);
+      param->setInvalid();
+    };
+
     bool parsingEnumElt
       = (paramContext == Parser::ParameterContextKind::EnumElement);
     // If we're not parsing an enum case, lack of a SourceLoc for both
@@ -438,7 +446,7 @@ mapParsedParameters(Parser &parser,
 
     // If we diagnosed this parameter as a parse error, propagate to the decl.
     if (paramInfo.isInvalid)
-      param->setInvalid();
+      setInvalid();
 
     // If a type was provided, create the type for the parameter.
     if (auto type = paramInfo.Type) {
@@ -462,8 +470,7 @@ mapParsedParameters(Parser &parser,
       if (!param->isInvalid())
         parser.diagnose(param->getLoc(), diag::missing_parameter_type);
 
-      param->getTypeLoc() = TypeLoc::withoutLoc(ErrorType::get(ctx));
-      param->setInvalid();
+      setInvalid();
     } else if (paramInfo.SpecifierLoc.isValid()) {
       StringRef specifier;
       switch (paramInfo.SpecifierKind) {

trunk/validation-test/compiler_crashers_2_fixed/0170-sr8475.swift

@@ -0,0 +1,8 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+func receive() {}
+func test() {
+  receive { (dat: Container<>) in
+    dat
+  }
+}