Merge pull request #25410 from DougGregor/local-subs-sr9954

Author: swift-ci

lib/Sema/TypeCheckType.cpp

@@ -826,6 +826,13 @@ Type TypeChecker::applyUnboundGenericArguments(
 
     subs = parentType->getContextSubstitutions(decl->getDeclContext());
     skipRequirementsCheck |= parentType->hasTypeVariable();
+  } else if (auto genericEnv =
+                 decl->getDeclContext()->getGenericEnvironmentOfContext()) {
+    auto subMap = genericEnv->getForwardingSubstitutionMap();
+    for (auto gp : subMap.getGenericSignature()->getGenericParams()) {
+      subs[gp->getCanonicalType()->castTo<GenericTypeParamType>()] =
+        Type(gp).subst(subMap);
+    }
   }
 
   SourceLoc noteLoc = decl->getLoc();

validation-test/compiler_crashers_2_fixed/0196-sr9954.swift

@@ -0,0 +1,28 @@
+// RUN: %target-swift-frontend %s -emit-ir
+
+// SR-9954 / rdar://problem/48223824
+// Rejects well-formed that triggered a fallback diagnostic due to a bad
+// substitution.
+struct GenericThing <Param1, Param2> {
+    init (closure: (String)->()) {
+        
+    }
+}
+
+struct ThingHolder <Param1> {
+    func acceptThing <Param2> (thingGenerator: ()->GenericThing<Param1, Param2>) {
+
+    }
+}
+
+struct A { }
+
+func demo <Param1> (thingHolder: ThingHolder<Param1>) {
+    typealias Thing <Param2> = GenericThing<Param1, Param2>
+    thingHolder.acceptThing {
+        Thing<A> { string in
+
+        }
+    }
+}
+