---

yaml
---
r: 268153
b: refs/heads/marcrasi-const-evaluator-part-2
c: d4fe6e9
h: refs/heads/master
i:
  268151: 99ba01d

Author: DougGregor

[refs]

@@ -1081,7 +1081,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-09-28-a: c30bf9b3ca148b1b90ebcd80141d9
 refs/heads/bananaphone: 2af9a1dc7f40dcb4b2949876f7e237763d1a7972
 refs/heads/marcrasi-const-evaluator-part-3: 867d96d6aa4cfb5079b7478be617387a1f621c88
 refs/heads/marcrasi-const-evaluator-part-1: 390daeaeea2181a1fc24910e09b5861053cd3558
-refs/heads/marcrasi-const-evaluator-part-2: cc2ee165a1229243ed03ca64b6e407d0f9f653aa
+refs/heads/marcrasi-const-evaluator-part-2: d4fe6e9ff71b33650956969faca114df0e1148e1
 refs/heads/revert-19689-keep-sourcekitd-response-alive-while-variant-lives: b5b1d9ab2340a64a3c7332529cdca1cb2318d93c
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-01-a: 63059bdab8bbcdd68591738fa28c68c8c19bde75
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-02-a: 12514879eff2c34a64ac6e65b323447f6525cfd0

branches/marcrasi-const-evaluator-part-2/stdlib/public/runtime/MetadataLookup.cpp

@@ -1326,6 +1326,9 @@ buildEnvironmentPath(
   unsigned totalKeyParamCount = 0;
   auto genericParams = environment->getGenericParameters();
   for (unsigned numLocalParams : environment->getGenericParameterCounts()) {
+    // Adkjust totalParamCount so we have the # of local parameters.
+    numLocalParams -= totalParamCount;
+
     // Get the local generic parameters.
     auto localGenericParams = genericParams.slice(0, numLocalParams);
     genericParams = genericParams.slice(numLocalParams);

branches/marcrasi-const-evaluator-part-2/test/stdlib/KeyPath.swift

@@ -768,6 +768,34 @@ keyPath.test("optional chaining component that needs generic instantiation") {
   Value6096<Int>().doSomething()
 }
 
+// Nested generics.
+protocol HasAssoc {
+  associatedtype A
+}
+
+struct Outer<T, U> {
+  struct Middle<V, W, X> {
+  }
+}
+
+extension Outer.Middle where V: HasAssoc, U == V.A, W == X {
+  struct Inner<Y: Hashable> {
+    func foo() ->  AnyKeyPath {
+      return \[Y?: [U]].values
+    }
+  }
+}
+
+extension Double: HasAssoc {
+  typealias A = Float
+}
+
+keyPath.test("nested generics") {
+  let nested = Outer<Int, Float>.Middle<Double, String, String>.Inner<UInt>()
+  let nestedKeyPath = nested.foo()
+  typealias DictType = [UInt? : [Float]]
+  expectTrue(nestedKeyPath is KeyPath<DictType, DictType.Values>)
+}
 
 runAllTests()