Merge pull request #7039 from briancroom/fix-XCTAssert-perf-regression-3.1

[3.1] [XCTest] Reduce bridging overhead from the exception-catching trampoline

Author: briancroom

stdlib/public/SDK/XCTest/XCTest.swift

@@ -53,25 +53,24 @@ enum _XCTThrowableBlockResult {
 /// and if it does consume the exception and return information about it.
 func _XCTRunThrowableBlock(_ block: () throws -> Void) -> _XCTThrowableBlockResult {
   var blockErrorOptional: Error?
-  
-  let d = _XCTRunThrowableBlockBridge({
+
+  let exceptionResult = _XCTRunThrowableBlockBridge({
     do {
       try block()
     } catch {
       blockErrorOptional = error
     }
   })
-  
+
   if let blockError = blockErrorOptional {
     return .failedWithError(error: blockError)
-  } else if d.count > 0 {
-    let t: String = d["type"]!
-    
-    if t == "objc" {
+  } else if let exceptionResult = exceptionResult {
+
+    if exceptionResult["type"] == "objc" {
       return .failedWithException(
-        className: d["className"]!,
-        name: d["name"]!,
-        reason: d["reason"]!)
+        className: exceptionResult["className"]!,
+        name: exceptionResult["name"]!,
+        reason: exceptionResult["reason"]!)
     } else {
       return .failedWithUnknownException
     }

stdlib/public/SDK/XCTest/XCTestCaseAdditions.mm

@@ -133,17 +133,15 @@ - (NSString *)className
 //
 // If no exception is thrown by the block, returns an empty dictionary.
 
-XCT_EXPORT NSDictionary *_XCTRunThrowableBlockBridge(void (^block)());
+XCT_EXPORT NSDictionary<NSString *, NSString *> *_XCTRunThrowableBlockBridge(void (^block)());
 
-NSDictionary *_XCTRunThrowableBlockBridge(void (^block)())
+NSDictionary<NSString *, NSString *> *_XCTRunThrowableBlockBridge(void (^block)())
 {
-    NSDictionary *result;
+    NSDictionary<NSString *, NSString *> *result = nil;
 
     @try {
         block();
-        result = @{};
     }
-
     @catch (NSException *exception) {
         result = @{
                    @"type": @"objc",
@@ -152,12 +150,11 @@ - (NSString *)className
                    @"reason": exception.reason,
                    };
     }
-
     @catch (...) {
         result = @{
                    @"type": @"unknown",
                    };
     }
 
-    return [result retain];
+    return result;
 }

stdlib/public/SwiftShims/XCTestOverlayShims.h

@@ -19,7 +19,7 @@
 
 XCTestCase * _Nonnull _XCTCurrentTestCase(void);
 
-NSDictionary<NSString *, NSString *> * _Nonnull
+NSDictionary<NSString *, NSString *> * _Nullable
 _XCTRunThrowableBlockBridge(void (^ _Nonnull NS_NOESCAPE block)());
 
 #endif // SWIFT_STDLIB_SHIMS_XCTEST_OVERLAY_H