---

yaml
---
r: 349597
b: refs/heads/master-next
c: d0190a5
h: refs/heads/master
i:
  349595: e0da040

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 9eeb66154bdb5fb77d897aafacfb780c7cb0affd
+refs/heads/master-next: d0190a5f866054c1879fcc68b173cd6232b4dc65
 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/AST/ASTScopeCreation.cpp

@@ -1788,7 +1788,7 @@ void PatternEntryDeclScope::beCurrent() {
   unsigned varCount = 0;
   getPatternEntry().getPattern()->forEachVariable(
       [&](VarDecl *) { ++varCount; });
-  varCountWhenLastExpanded = 0;
+  varCountWhenLastExpanded = varCount;
 }
 bool PatternEntryDeclScope::isCurrent() const {
   if (initWhenLastExpanded != getPatternEntry().getOriginalInit())

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

@@ -1924,6 +1924,10 @@ ConstraintSystem::matchExistentialTypes(Type type1, Type type2,
           // with overloaded declarations.
           if (last->getKind() == ConstraintLocator::ApplyArgToParam)
             return getTypeMatchFailure(locator);
+        } else { // There are no elements in the path
+          auto *anchor = locator.getAnchor();
+          if (!(anchor && isa<AssignExpr>(anchor)))
+            return getTypeMatchFailure(locator);
         }
 
         auto *fix = MissingConformance::forContextual(

branches/master-next/validation-test/compiler_crashers_2_fixed/sr11394.swift

@@ -0,0 +1,5 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+protocol Foo {}
+func foo(_ bar: Foo) {}
+foo(true ? "a" : "b")