Merge pull request #22291 from DougGregor/name-lookup-archetype-anchor-rdar47605019

[Type checker] Ensure that we record archetype anchors.

Author: DougGregor

lib/Sema/TypeCheckType.cpp

@@ -602,6 +602,8 @@ Type TypeChecker::resolveTypeInContext(
           if (resolution.getStage() == TypeResolutionStage::Structural) {
             return resolution.resolveSelfAssociatedType(
               selfType, foundDC, typeDecl->getName());
+          } else if (auto assocType = dyn_cast<AssociatedTypeDecl>(typeDecl)) {
+            typeDecl = assocType->getAssociatedTypeAnchor();
           }
         }
       }

test/Generics/associated_type_anchor_rdar47605019.swift

@@ -0,0 +1,18 @@
+// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s
+
+// Ensure that the superclass's generid argument canonicalizes to
+// Sequence.Element.
+
+// CHECK: @"symbolic _____y7ElementSTQzG
+
+public protocol ElementTypeProtocol: RandomAccessCollection {
+    typealias ElementType = Element
+}
+extension Array: ElementTypeProtocol {}
+
+private class WrapperBase<T> {}
+private final class WrapperDerived<C: ElementTypeProtocol>: WrapperBase<C.ElementType> {
+    init(base: C) {
+        let _ = base
+    }
+}