Merge pull request #537 from Quick/noescape-workaround

🐛Workaround to noescape bug in Xcode 10 beta 1
Quick · Jun 14, 2018 · 69bb161 · 69bb161
2 parents 93d4a94 + ec4db80
commit 69bb161
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Sources/Nimble/Adapters/AssertionRecorder.swift b/Sources/Nimble/Adapters/AssertionRecorder.swift
@@ -50,8 +50,12 @@ public func withAssertionHandler(_ tempAssertionHandler: AssertionHandler, closu
         environment.assertionHandler = oldRecorder
     }))
     environment.assertionHandler = tempAssertionHandler
-    capturer.tryBlock {
-        try! closure()
+    // TEMP: withoutActuallyEscaping is workaround to Radar 40857699
+    // https://openradar.appspot.com/radar?id=5595735974215680
+    withoutActuallyEscaping(closure) { escapable in
+        capturer.tryBlock {
+            try! escapable()
+        }
     }
 }
 

diff --git a/Sources/NimbleObjectiveC/NMBExceptionCapture.h b/Sources/NimbleObjectiveC/NMBExceptionCapture.h
@@ -4,7 +4,14 @@
 @interface NMBExceptionCapture : NSObject
 
 - (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnull))handler finally:(void(^ _Nullable)(void))finally;
-- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)(void))unsafeBlock NS_SWIFT_NAME(tryBlock(_:));
+
+/**
+ TEMP: unsafeBlock should be annotated with __attribute__((noescape)). This was removed
+ as a workaround to Radar 40857699 https://openradar.appspot.com/radar?id=5595735974215680
+
+ @param unsafeBlock Closure to run inside an @try block.
+ */
+- (void)tryBlock:(void(^ _Nonnull)(void))unsafeBlock NS_SWIFT_NAME(tryBlock(_:));
 
 @end
 

diff --git a/Sources/NimbleObjectiveC/NMBExceptionCapture.m b/Sources/NimbleObjectiveC/NMBExceptionCapture.m
@@ -16,7 +16,7 @@ - (nonnull instancetype)initWithHandler:(void(^ _Nullable)(NSException * _Nonnul
     return self;
 }
 
-- (void)tryBlock:(__attribute__((noescape)) void(^ _Nonnull)(void))unsafeBlock {
+- (void)tryBlock:(void(^ _Nonnull)(void))unsafeBlock {
     @try {
         unsafeBlock();
     }