Reflection: Clean up duplication in typeref_decoding*.result.txt

Previously we would pre-process the same input files in the ObjC
and non-ObjC tests. This made the tests difficult to update because
the output of one was a subset of the other, and only one of the
two tests would run on any given platform.

Instead, let's just put the Objective-C tests in their own test
and input files.

Author: slavapestov

include/swift/Reflection/ReflectionContext.h

@@ -286,7 +286,7 @@ class ReflectionContext
         auto protocolName = Demangle::demangleTypeAsString(
           descriptor.getMangledProtocolTypeName());
 
-        OS << conformingTypeName << " : " << protocolName;
+        OS << "- " << conformingTypeName << " : " << protocolName;
         OS << '\n';
 
         for (const auto &associatedType : descriptor) {
@@ -303,7 +303,7 @@ class ReflectionContext
         auto typeName = Demangle::demangleTypeAsString(
           descriptor.getMangledTypeName());
 
-        OS << typeName << " :\n";
+        OS << "\n- " << typeName << ":\n";
         OS << "Size: " << descriptor.Size << "\n";
         OS << "Alignment: " << descriptor.Alignment << "\n";
         OS << "Stride: " << descriptor.Stride << "\n";

test/Reflection/Inputs/ConcreteTypes.swift

@@ -1,7 +1,3 @@
-#if _runtime(_ObjC)
-import Foundation
-#endif
-
 public class Box<Treasure> {
   public let item: Treasure
   public init(item: Treasure) {
@@ -60,30 +56,3 @@ public struct References {
   public weak var weakRef: C?
   public unowned var unownedRef: C
 }
-
-#if _runtime(_ObjC)
-
-public class OC : NSObject {
-  public let aClass: C
-  public let aStruct: S
-  public let anEnum: E
-  public let aTuple: (C, S, E, Int)
-  public let aMetatype: C.Type
-  public let aFunction: (C, S, E, Int) -> (Int)
-  public let nsObject: NSObject
-  public let nsString: NSString
-  public let cfString: CFString
-  public init(aClass: C, aStruct: S, anEnum: E, aTuple: (C, S, E, Int), aMetatype: C.Type, aFunction: (C, S, E, Int) -> Int, nsObject: NSObject, nsString: NSString, cfString: CFString) {
-    self.aClass = aClass
-    self.aStruct = aStruct
-    self.anEnum = anEnum
-    self.aTuple = aTuple
-    self.aMetatype = aMetatype
-    self.aFunction = aFunction
-    self.nsObject = nsObject
-    self.nsString = nsString
-    self.cfString = cfString
-  }
-}
-
-#endif

test/Reflection/Inputs/GenericTypes.swift

@@ -1,7 +1,3 @@
-#if _runtime(_ObjC)
-import Foundation
-#endif
-
 public class C1<T> : ClassBoundP {
   public typealias Function = C1<T> -> S1<T> -> E1<T> -> Int
   public typealias Tuple = (C1<T>, S1<T>, E1<T>, Int)
@@ -162,16 +158,3 @@ extension E4 : P1, P2, P3 {
   public typealias Outer = U
   public typealias Second = U
 }
-
-#if _runtime(_ObjC)
-
-public class GenericOC<T> : NSObject {
-  public let ocnss: GenericOC<NSString>
-  public let occfs: GenericOC<CFString>
-  public init(nss: GenericOC<NSString>, cfs: GenericOC<CFString>) {
-    self.ocnss = nss
-    self.occfs = cfs
-  }
-}
-
-#endif

test/Reflection/Inputs/ObjectiveCTypes.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+public class OC : NSObject {
+  public let nsObject: NSObject
+  public let nsString: NSString
+  public let cfString: CFString
+  public init(nsObject: NSObject, nsString: NSString, cfString: CFString) {
+    self.nsObject = nsObject
+    self.nsString = nsString
+    self.cfString = cfString
+  }
+}
+
+public class GenericOC<T> : NSObject {
+  public let ocnss: GenericOC<NSString>
+  public let occfs: GenericOC<CFString>
+  public init(nss: GenericOC<NSString>, cfs: GenericOC<CFString>) {
+    self.ocnss = nss
+    self.occfs = cfs
+  }
+}

test/Reflection/typeref_decoding.result.txt

@@ -556,40 +556,40 @@ TypesToReflect.E4
 
 ASSOCIATED TYPES:
 =================
-TypesToReflect.Box : Swift.AnyObject
-TypesToReflect.C : Swift.AnyObject
-TypesToReflect.C1 : Swift.AnyObject
-TypesToReflect.C1 : TypesToReflect.ClassBoundP
+- TypesToReflect.Box : Swift.AnyObject
+- TypesToReflect.C : Swift.AnyObject
+- TypesToReflect.C1 : Swift.AnyObject
+- TypesToReflect.C1 : TypesToReflect.ClassBoundP
 typealias Inner = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.C2 : Swift.AnyObject
-TypesToReflect.C3 : Swift.AnyObject
-TypesToReflect.C4 : TypesToReflect.P1
+- TypesToReflect.C2 : Swift.AnyObject
+- TypesToReflect.C3 : Swift.AnyObject
+- TypesToReflect.C4 : TypesToReflect.P1
 typealias Inner = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.C4 : TypesToReflect.P2
+- TypesToReflect.C4 : TypesToReflect.P2
 typealias Outer = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.S4 : TypesToReflect.P1
+- TypesToReflect.S4 : TypesToReflect.P1
 typealias Inner = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.S4 : TypesToReflect.P2
+- TypesToReflect.S4 : TypesToReflect.P2
 typealias Outer = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.E4 : TypesToReflect.P1
+- TypesToReflect.E4 : TypesToReflect.P1
 typealias Inner = A
 (generic-type-parameter depth=0 index=0)
 
-TypesToReflect.E4 : TypesToReflect.P2
+- TypesToReflect.E4 : TypesToReflect.P2
 typealias Outer = B
 (generic-type-parameter depth=0 index=1)
 
-TypesToReflect.E4 : TypesToReflect.P3
+- TypesToReflect.E4 : TypesToReflect.P3
 typealias First = A
 (generic-type-parameter depth=0 index=0)
 

test/Reflection/typeref_decoding.swift

@@ -1,4 +1,3 @@
-// UNSUPPORTED: objc_interop
 // RUN: rm -rf %t && mkdir -p %t
 // RUN: %target-build-swift %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -o %t/libTypesToReflect
 // RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect > %t/typeref_decoding.txt