AST: TypeMatcher needs to walk into DynamicSelfType

Author: slavapestov

include/swift/AST/TypeMatcher.h

@@ -229,9 +229,27 @@ class TypeMatcher {
     }
 
     TRIVIAL_CASE(ModuleType)
-    TRIVIAL_CASE(DynamicSelfType)
     TRIVIAL_CASE(ArchetypeType)
 
+    bool visitDynamicSelfType(CanDynamicSelfType firstDynamicSelf,
+                              Type secondType,
+                              Type sugaredFirstType) {
+      if (auto secondDynamicSelf = secondType->getAs<DynamicSelfType>()) {
+        auto firstBase = firstDynamicSelf->getSelfType();
+        auto secondBase = secondDynamicSelf->getSelfType();
+        auto firstSugaredBase = sugaredFirstType->getAs<DynamicSelfType>()
+            ->getSelfType();
+
+        if (!this->visit(CanType(firstBase), secondBase, firstSugaredBase))
+          return false;
+
+        return true;
+      }
+
+      return mismatch(firstDynamicSelf.getPointer(), secondType,
+                      sugaredFirstType);
+    }
+
     bool visitDependentMemberType(CanDependentMemberType firstType,
                                    Type secondType,
                                    Type sugaredFirstType) {

test/SILGen/dynamic_self.swift

@@ -1,10 +1,10 @@
-// RUN: %target-swift-emit-silgen -swift-version 4 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck %s
-// RUN: %target-swift-emit-sil -swift-version 4 -O %s -disable-objc-attr-requires-foundation-module -enable-objc-interop
-// RUN: %target-swift-emit-ir -swift-version 4 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop
+// RUN: %target-swift-emit-silgen -swift-version 4 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify | %FileCheck %s
+// RUN: %target-swift-emit-sil -swift-version 4 -O %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify
+// RUN: %target-swift-emit-ir -swift-version 4 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify
 
-// RUN: %target-swift-emit-silgen -swift-version 5 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck %s
-// RUN: %target-swift-emit-sil -swift-version 5 -O %s -disable-objc-attr-requires-foundation-module -enable-objc-interop
-// RUN: %target-swift-emit-ir -swift-version 5 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop
+// RUN: %target-swift-emit-silgen -swift-version 5 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify | %FileCheck %s
+// RUN: %target-swift-emit-sil -swift-version 5 -O %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify
+// RUN: %target-swift-emit-ir -swift-version 5 %s -disable-objc-attr-requires-foundation-module -enable-objc-interop -requirement-machine-abstract-signatures=verify
 
 protocol P {
   func f() -> Self