Reflection: Fix tests for iPhoneOS

Author: slavapestov

test/Reflection/Inputs/ObjectiveCTypes.swift

@@ -1,4 +1,5 @@
 import Foundation
+import CoreGraphics
 
 public class OC : NSObject {
   public let nsObject: NSObject
@@ -26,7 +27,7 @@ public class GenericOC<T> : NSObject {
 public class HasObjCClasses {
   let url = NSURL()
   let integer = NSInteger()
-  let rect = NSRect(x: 0, y: 1, width: 2, height: 3)
+  let rect = CGRect(x: 0, y: 1, width: 2, height: 3)
 }
 
 public func closureHasObjCClasses(b: NSBundle, c: NSCoding) -> () -> () {

test/Reflection/typeref_decoding_objc.swift

@@ -1,6 +1,6 @@
 // RUN: rm -rf %t && mkdir -p %t
 // RUN: %target-build-swift %S/Inputs/ObjectiveCTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/libTypesToReflect.%target-dylib-extension
-// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s --check-prefix=CHECK
+// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK
 // REQUIRES: objc_interop
 
 // CHECK: FIELDS:
@@ -54,11 +54,16 @@
 // CHECK: BUILTIN TYPES:
 // CHECK: ==============
 
-// CHECK: - __C.CGRect:
-// CHECK: Size: 32
-// CHECK: Alignment: 8
-// CHECK: Stride: 32
-// CHECK: NumExtraInhabitants: 0
+// CHECK-32: - __C.CGRect:
+// CHECK-32: Size: 16
+// CHECK-32: Alignment: 4
+// CHECK-32: Stride: 16
+// CHECK-32: NumExtraInhabitants: 0
+
+// CHECK-64: Size: 32
+// CHECK-64: Alignment: 8
+// CHECK-64: Stride: 32
+// CHECK-64: NumExtraInhabitants: 0
 
 // CHECK: CAPTURE DESCRIPTORS:
 // CHECK: ====================

validation-test/Reflection/functions_objc.swift

@@ -5,24 +5,25 @@
 
 import SwiftReflectionTest
 import Foundation
+import CoreGraphics
 
-func capturesImportedTypes(x: Int, n: NSURL, r: NSRect, c: NSCoding) {
+func capturesImportedTypes(x: Int, n: NSURL, r: CGRect, c: NSCoding) {
   reflect(function: {print(x); print(n); print(r); print(c)})
 
 // CHECK-32:      Type reference:
 // CHECK-32-NEXT: (builtin Builtin.NativeObject)
 
 // CHECK-32:      Type info:
-// CHECK-32-NEXT: (closure_context size=60 alignment=8 stride=60 num_extra_inhabitants=0
+// CHECK-32-NEXT: (closure_context size=40 alignment=4 stride=40 num_extra_inhabitants=0
 // CHECK-32-NEXT:   (field offset=12
 // CHECK-32-NEXT:     (struct size=4 alignment=4 stride=4 num_extra_inhabitants=0
 // CHECK-32-NEXT:       (field name=_value offset=0
 // CHECK-32-NEXT:         (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0))))
 // CHECK-32-NEXT:   (field offset=16
 // CHECK-32-NEXT:     (reference kind=strong refcounting=unknown))
-// CHECK-32-NEXT:   (field offset=24
-// CHECK-32-NEXT:     (builtin size=32 alignment=8 stride=32 num_extra_inhabitants=0))
-// CHECK-32-NEXT:   (field offset=56
+// CHECK-32-NEXT:   (field offset=20
+// CHECK-32-NEXT:     (builtin size=16 alignment=4 stride=16 num_extra_inhabitants=0))
+// CHECK-32-NEXT:   (field offset=36
 // CHECK-32-NEXT:     (reference kind=strong refcounting=unknown)))
 
 // CHECK-64:      Type reference:
@@ -42,6 +43,6 @@ func capturesImportedTypes(x: Int, n: NSURL, r: NSRect, c: NSCoding) {
 // CHECK-64-NEXT:     (reference kind=strong refcounting=unknown)))
 }
 
-capturesImportedTypes(x: 10, n: NSURL(), r: NSRect(x: 1, y: 2, width: 3, height: 4), c: "" as NSString)
+capturesImportedTypes(x: 10, n: NSURL(), r: CGRect(x: 1, y: 2, width: 3, height: 4), c: "" as NSString)
 
 doneReflecting()