Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/Serialization/Deserialization.cpp

@@ -1146,11 +1146,14 @@ static void filterValues(Type expectedTy, ModuleDecl *expectedModule,
 
     if (isType != isa<TypeDecl>(value))
       return true;
-    auto ifaceTy = value->getInterfaceType();
-    if (!ifaceTy)
-      return true;
-    if (canTy && ifaceTy->getCanonicalType() != canTy)
-      return true;
+
+    // If we're expecting a type, make sure this decl has the expected type.
+    if (canTy)  {
+      auto ifaceTy = value->getInterfaceType();
+      if (!ifaceTy || !ifaceTy->isEqual(canTy))
+        return true;
+    }
+
     if (value->isStatic() != isStatic)
       return true;
     if (value->hasClangNode() != importedFromClang)

test/Serialization/Inputs/multi-file-subclass-generic-instantiation-extension.swift

@@ -0,0 +1,3 @@
+extension Subclass {
+  struct MemberTypeFromOtherFile {}
+}

test/Serialization/multi-file-subclass-generic-instantiation.swift

@@ -0,0 +1,8 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-build-swift -emit-module -o %t/Module.swiftmodule %s %S/Inputs/multi-file-subclass-generic-instantiation-extension.swift
+
+// https://bugs.swift.org/browse/SR-11495
+
+class Superclass<T> {}
+class Subclass: Superclass<Subclass.MemberTypeFromOtherFile> {}