Add ObjectiveC bridging stub test support

This allows for testing the autogenerated bridging stub code.

Author: aschwaighofer

benchmark/CMakeLists.txt

@@ -16,6 +16,7 @@ include(AddSwiftBenchmarkSuite)
 
 set(SWIFT_BENCH_MODULES
     single-source/unit-tests/ObjectiveCBridging
+    single-source/unit-tests/ObjectiveCBridgingStubs
     single-source/unit-tests/StackPromo
     single-source/Ackermann
     single-source/AngryPhonebook

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -49,7 +49,8 @@ function (swift_benchmark_compile_archopts)
       "-${BENCH_COMPILE_ARCHOPTS_OPT}"
       "-D" "INTERNAL_CHECKS_ENABLED"
       "-D" "SWIFT_ENABLE_OBJECT_LITERALS"
-      "-no-link-objc-runtime")
+      "-no-link-objc-runtime"
+      "-I" "${srcdir}/utils/ObjectiveCTests")
 
   # Always optimize the driver modules.
   # Note that we compile the driver for Ounchecked also with -Ounchecked
@@ -281,10 +282,33 @@ function (swift_benchmark_compile_archopts)
     set(OUTPUT_EXEC "${benchmark-bin-dir}/Benchmark_${BENCH_COMPILE_ARCHOPTS_OPT}-${target}")
   endif()
 
+  set(objcfile "${objdir}/ObjectiveCTests.o")
+  add_custom_command(
+      OUTPUT "${objcfile}"
+      DEPENDS "${srcdir}/utils/ObjectiveCTests/ObjectiveCTests.m"
+        "${srcdir}/utils/ObjectiveCTests/ObjectiveCTests.h"
+      COMMAND
+        "${CLANG_EXEC}"
+        "-fno-stack-protector"
+        "-fPIC"
+        "-Werror=date-time"
+        "-fcolor-diagnostics"
+        "-O3"
+        "-target" "${target}"
+        "-isysroot" "${sdk}"
+        "-arch" "${BENCH_COMPILE_ARCHOPTS_ARCH}"
+        "-F" "${sdk}/../../../Developer/Library/Frameworks"
+        "-m${triple_platform}-version-min=${ver}"
+        "-I" "${srcdir}/utils/ObjectiveCTests"
+        "${srcdir}/utils/ObjectiveCTests/ObjectiveCTests.m"
+        "-c"
+        "-o" "${objcfile}")
+
   add_custom_command(
       OUTPUT "${OUTPUT_EXEC}"
       DEPENDS
         ${bench_library_objects} ${SWIFT_BENCH_OBJFILES}
+        "${objcfile}"
         "adhoc-sign-swift-stdlib-${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
       COMMAND
         "${CLANG_EXEC}"
@@ -306,6 +330,7 @@ function (swift_benchmark_compile_archopts)
         "-Xlinker" "@executable_path/../lib/swift/${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
         ${bench_library_objects}
         ${SWIFT_BENCH_OBJFILES}
+        ${objcfile}
         "-o" "${OUTPUT_EXEC}"
       COMMAND
         "codesign" "-f" "-s" "-" "${OUTPUT_EXEC}")

benchmark/single-source/unit-tests/ObjectiveCBridgingStubs.swift

@@ -0,0 +1,84 @@
+//===---------- ObjectiveCBridgingStubs.swift -----------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+import Foundation
+import ObjectiveCTests
+
+@inline(never)
+func testObjectiveCBridgeStubFromNSString() {
+   let b = BridgeTester()
+   var str = ""
+   for _ in 0 ..< 10_000 {
+     str = b.testToString()
+   }
+   CheckResults(str != "" && str == "Default string value no tagged pointer", "Wrong value returned")
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStubFromNSString(N: Int) {
+  for _ in 0 ..< N {
+    testObjectiveCBridgeStubFromNSString()
+  }
+}
+
+
+@inline(never)
+func testObjectiveCBridgeStubToNSString() {
+   let b = BridgeTester()
+   let str = "hello world"
+   for _ in 0 ..< 10_000 {
+     b.test(from: str)
+   }
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStubToNSString(N: Int) {
+  for _ in 0 ..< N {
+    testObjectiveCBridgeStubToNSString()
+  }
+}
+@inline(never)
+func testObjectiveCBridgeStubFromArrayOfNSString() {
+   let b = BridgeTester()
+   var arr : [String] = []
+   var str = ""
+   for _ in 0 ..< 10_000 {
+     arr = b.testToArrayOfStrings()
+     str = arr[0]
+   }
+   CheckResults(str != "" && str == "Default string value no tagged pointer", "Wrong value returned")
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStubFromArrayOfNSString(N: Int) {
+  for _ in 0 ..< N {
+    testObjectiveCBridgeStubFromArrayOfNSString()
+  }
+}
+@inline(never)
+func testObjectiveCBridgeStubToArrayOfNSString() {
+   let b = BridgeTester()
+   let str = "hello world"
+   let arr = [ str, str, str, str, str,
+               str, str, str, str, str ]
+   for _ in 0 ..< 10_000 {
+     b.test(fromArrayOf: arr)
+   }
+}
+
+@inline(never)
+public func run_ObjectiveCBridgeStubToArrayOfNSString(N: Int) {
+  for _ in 0 ..< N {
+    testObjectiveCBridgeStubToArrayOfNSString()
+  }
+}

benchmark/utils/ObjectiveCTests/ObjectiveCTests.h

@@ -0,0 +1,26 @@
+//===---------------- ObjectiveCTests.h -----------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#import <Foundation/Foundation.h>
+
+@interface BridgeTester : NSObject {
+  NSString *myString;
+  NSArray<NSString *> *myArrayOfStrings;
+}
+
+- (id)init;
+- (void)testFromString:(NSString *) str;
+- (NSString *)testToString;
+- (void)testFromArrayOfStrings:(NSArray<NSString *> *)arr;
+- (NSArray<NSString *> *)testToArrayOfStrings;
+
+@end

benchmark/utils/ObjectiveCTests/ObjectiveCTests.m

@@ -0,0 +1,47 @@
+//===---------------- ObjectiveCTests.h -----------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#import "ObjectiveCTests.h"
+
+@implementation BridgeTester
+
+- (id)init {
+  self = [super init];
+  if (!self)
+    return self;
+  myString = @"Default string value no tagged pointer";
+  id mutableArray = [NSMutableArray new];
+  for (int i = 0; i < 10; ++i) {
+    [mutableArray addObject: myString];
+  }
+  myArrayOfStrings = [mutableArray copy];
+  return self;
+}
+
+- (NSString *)testToString {
+  return myString;
+}
+
+- (void)testFromString:(NSString *)str {
+  unichar c = [str characterAtIndex:0];
+}
+- (void)testFromArrayOfStrings:(NSArray<NSString *> *)arr {
+  // Get an element to force lazy bridging to happen.
+  id str = [arr objectAtIndex:0];
+}
+
+- (NSArray<NSString *> *)testToArrayOfStrings {
+  return myArrayOfStrings;
+}
+
+
+@end

benchmark/utils/ObjectiveCTests/module.map

@@ -0,0 +1,15 @@
+//===--- module.map -------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+module ObjectiveCTests {
+  header "ObjectiveCTests.h"
+}

benchmark/utils/main.swift

@@ -64,6 +64,7 @@ import NSStringConversion
 import NopDeinit
 import ObjectAllocation
 import ObjectiveCBridging
+import ObjectiveCBridgingStubs
 import OpenClose
 import Phonebook
 import PolymorphicCalls
@@ -166,6 +167,10 @@ precommitTests = [
   "ObjectiveCBridgeFromNSSetAnyObjectToString": run_ObjectiveCBridgeFromNSSetAnyObjectToString,
   "ObjectiveCBridgeFromNSSetAnyObjectToStringForced": run_ObjectiveCBridgeFromNSSetAnyObjectToStringForced,
   "ObjectiveCBridgeToNSSet": run_ObjectiveCBridgeToNSSet,
+  "ObjectiveCBridgeStubFromNSString": run_ObjectiveCBridgeStubFromNSString,
+  "ObjectiveCBridgeStubToNSString": run_ObjectiveCBridgeStubToNSString,
+  "ObjectiveCBridgeStubFromArrayOfNSString": run_ObjectiveCBridgeStubFromArrayOfNSString,
+  "ObjectiveCBridgeStubToArrayOfNSString": run_ObjectiveCBridgeStubToArrayOfNSString,
   "OpenClose": run_OpenClose,
   "Phonebook": run_Phonebook,
   "PolymorphicCalls": run_PolymorphicCalls,