Merge pull request #8913 from jrose-apple/generic-typealiases-serialization

swift-ci · web-flow · commit 6525f0305aae · 2017-04-21T10:27:10.000-07:00
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -4425,7 +4425,7 @@ Expected<Type> ModuleFile::getTypeChecked(TypeID TID) {
     decls_block::UnboundGenericTypeLayout::readRecord(scratch,
                                                       genericID, parentID);
 
-    auto genericDecl = cast<NominalTypeDecl>(getDecl(genericID));
+    auto genericDecl = cast<GenericTypeDecl>(getDecl(genericID));
     typeOrOffset = UnboundGenericType::get(genericDecl, getType(parentID), ctx);
     break;
   }
diff --git a/test/Serialization/Inputs/alias.swift b/test/Serialization/Inputs/alias.swift
@@ -31,3 +31,6 @@ public protocol ProtoWrapper {}
 extension ProtoWrapper {
   public typealias Boolean = Bool
 }
+
+public struct Outer { public typealias G<T> = T }
+public typealias GG = Outer.G
diff --git a/test/Serialization/typealias.swift b/test/Serialization/typealias.swift
@@ -52,3 +52,5 @@ print("\(dyadic((named.b, i))) \(dyadic(both))\n", terminator: "")
 func check(_: BaseAlias) {
 }
 
+let x: GG<Int> = 0
+

Original file line number	Diff line number	Diff line change
`@@ -4425,7 +4425,7 @@ Expected<Type> ModuleFile::getTypeChecked(TypeID TID) {`
`4425`	`4425`	`decls_block::UnboundGenericTypeLayout::readRecord(scratch,`
`4426`	`4426`	`genericID, parentID);`
`4427`	`4427`
`4428`		`- auto genericDecl = cast<NominalTypeDecl>(getDecl(genericID));`
	`4428`	`+ auto genericDecl = cast<GenericTypeDecl>(getDecl(genericID));`
`4429`	`4429`	`typeOrOffset = UnboundGenericType::get(genericDecl, getType(parentID), ctx);`
`4430`	`4430`	`break;`
`4431`	`4431`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,3 +31,6 @@ public protocol ProtoWrapper {}`
`31`	`31`	`extension ProtoWrapper {`
`32`	`32`	`public typealias Boolean = Bool`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+public struct Outer { public typealias G<T> = T }`
	`36`	`+public typealias GG = Outer.G`
Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,5 @@ print("\(dyadic((named.b, i))) \(dyadic(both))\n", terminator: "")`
`52`	`52`	`func check(_: BaseAlias) {`
`53`	`53`	`}`
`54`	`54`
	`55`	`+let x: GG<Int> = 0`
	`56`	`+`