IRGen: Also handle nested types inside of extensions

rdar://39648725

Author: aschwaighofer

lib/IRGen/GenMeta.cpp

@@ -2829,8 +2829,8 @@ void irgen::emitStructMetadata(IRGenModule &IGM, StructDecl *structDecl) {
 void IRGenerator::noteUseOfAnyParentTypeMetadata(NominalTypeDecl *type) {
   // If this is a nested type we also potentially might need the outer types.
   auto *declCtxt = type->getDeclContext();
-  assert(declCtxt);
-  auto *parentNominalDecl = dyn_cast_or_null<NominalTypeDecl>(declCtxt);
+  auto *parentNominalDecl =
+    declCtxt->getAsNominalTypeOrNominalTypeExtensionContext();
   if (!parentNominalDecl)
     return;
 

test/multifile/Inputs/nested_types_defs.swift

@@ -13,3 +13,8 @@ struct Outer3 {
   }
 }
 
+struct Outer4 {}
+
+extension Outer4 {
+  struct InnerExtension {}
+}

test/multifile/nested_types.swift

@@ -2,20 +2,23 @@
 
 // Make sure we generate the outer metadata.
 
-// CHECK-DAG: @"$S4test6Outer3VMf" = internal constant {{.*}} @"$SytWV"{{.*}}@"$S4test6Outer3VMn"
+// CHECK-DAG: @"$S4test5OuterVMf" = internal constant {{.*}} @"$SytWV"{{.*}}@"$S4test5OuterVMn"
 // CHECK-DAG: @"$S4test6Outer2VMf" = internal constant {{.*}} @"$SytWV"{{.*}}@"$S4test6Outer2VMn"
 // CHECK-DAG: @"$S4test6Outer3VMf" = internal constant {{.*}} @"$SytWV"{{.*}}@"$S4test6Outer3VMn"
+// CHECK-DAG: @"$S4test6Outer4VMf" = internal constant {{.*}} @"$SytWV"{{.*}}@"$S4test6Outer4VMn"
 
 class C<T> { }
 
 struct Y {
   let x:C<Outer.Inner>
   let y:C<Outer2.InnerE>
   let z:C<Outer3.InnerC>
+  let w:C<Outer4.InnerExtension>
 }
 
 public func test() {
-  var c = Y(x: C<Outer.Inner>(), y: C<Outer2.InnerE>(), z: C<Outer3.InnerC>())
+  var c = Y(x: C<Outer.Inner>(), y: C<Outer2.InnerE>(), z: C<Outer3.InnerC>(),
+            w: C<Outer4.InnerExtension>())
 
   print("a \(c)")
 }

test/multifile/nested_types/main.swift

@@ -8,13 +8,14 @@ struct Y {
   let x:C<Outer.Inner>
   let y:C<Outer2.InnerE>
   let z:C<Outer3.InnerC>
+  let w:C<Outer4.InnerExtension>
 }
 
 func test() {
-  var c = Y(x: C<Outer.Inner>(), y: C<Outer2.InnerE>(), z: C<Outer3.InnerC>())
+  var c = Y(x: C<Outer.Inner>(), y: C<Outer2.InnerE>(), z: C<Outer3.InnerC>(), w: C<Outer4.InnerExtension>())
 
   print("a \(c)")
 }
 
-// CHECK: a Y(x: a.C<a.Outer.Inner>, y: a.C<a.Outer2.InnerE>, z: a.C<a.Outer3.InnerC>)
+// CHECK: a Y(x: a.C<a.Outer.Inner>, y: a.C<a.Outer2.InnerE>, z: a.C<a.Outer3.InnerC>, w: a.C<a.Outer4.InnerExtension>)
 test()