Merge pull request #16788 from xedin/rdar-37384120-4.2

[4.2][Serialization] Allow unbound generic types to cross-reference typeal…

Author: xedin

lib/Serialization/Serialization.cpp

@@ -3954,7 +3954,9 @@ void Serializer::writeType(Type ty) {
 
     unsigned abbrCode = DeclTypeAbbrCodes[UnboundGenericTypeLayout::Code];
     UnboundGenericTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
-                                         addDeclRef(generic->getDecl()),
+                                         addDeclRef(generic->getDecl(),
+                                                    /*forceSerialization*/false,
+                                                    /*allowTypeAliasXRef*/true),
                                          addTypeRef(generic->getParent()));
     break;
   }

test/Serialization/Inputs/alias.swift

@@ -36,3 +36,6 @@ public struct Outer { public typealias G<T> = T }
 public typealias GG = Outer.G
 
 public typealias GInt = Outer.G<Int>
+
+public struct UnboundStruct<T> {}
+public typealias UnboundAlias<T: Comparable> = UnboundStruct<T>

test/Serialization/typealias.swift

@@ -1,5 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-build-swift -module-name alias -emit-module -o %t %S/Inputs/alias.swift
+// RUN: %target-build-swift -I %t %s -module-name typealias -emit-module-path %t/typealias.swiftmodule -o %t/typealias.o
 // RUN: llvm-bcanalyzer %t/alias.swiftmodule | %FileCheck %s
 // RUN: %target-build-swift -I %t %s -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck -check-prefix=OUTPUT %s
@@ -53,3 +54,5 @@ func check(_: BaseAlias) {
 
 let x: GG<Int> = 0
 let x2: GInt = 1
+
+public typealias TestUnbound = UnboundAlias