Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

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())

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(

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")