---

theblixguy · theblixguy · commit b606291871a6 · 2019-07-14T00:51:05.000+01:00
yaml --- r: 341822 b: refs/heads/rxwei-patch-1 c: e16eb86 h: refs/heads/master
diff --git a/[refs] b/[refs]
@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: cdac0c03d0db3ec59b6677b944466c5748263e00
+refs/heads/rxwei-patch-1: e16eb86bc0a880332afce996f7739aec9a516f18
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9
diff --git a/branches/rxwei-patch-1/lib/Sema/TypeCheckDeclOverride.cpp b/branches/rxwei-patch-1/lib/Sema/TypeCheckDeclOverride.cpp
@@ -996,7 +996,7 @@ static GenericSignature *getOverrideGenericSignature(ValueDecl *base,
   auto substFn = [&](SubstitutableType *type) -> Type {
     auto *gp = cast<GenericTypeParamType>(type);
 
-    if (gp->getDepth() < superclassDepth) {
+    if (gp->getDepth() < baseDepth) {
       return Type(gp).subst(subMap);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ static GenericSignature getOverrideGenericSignature(ValueDecl base,`
`996`	`996`	`auto substFn = [&](SubstitutableType *type) -> Type {`
`997`	`997`	`auto *gp = cast<GenericTypeParamType>(type);`
`998`	`998`
`999`		`- if (gp->getDepth() < superclassDepth) {`
	`999`	`+ if (gp->getDepth() < baseDepth) {`
`1000`	`1000`	`return Type(gp).subst(subMap);`
`1001`	`1001`	`}`
`1002`	`1002`