X-Git-Url: https://git.saurik.com/apple/objc4.git/blobdiff_plain/7af964d1562d70f51a8e9aca24215ac3d83d0624..refs/heads/master:/runtime/objc-exception.h

diff --git a/runtime/objc-exception.h b/runtime/objc-exception.h
index 17c0b61..c93b47b 100644
--- a/runtime/objc-exception.h
+++ b/runtime/objc-exception.h
@@ -31,52 +31,105 @@
 
 // compiler reserves a setjmp buffer + 4 words as localExceptionData
 
-OBJC_EXPORT void objc_exception_throw(id exception);
-OBJC_EXPORT void objc_exception_try_enter(void *localExceptionData);
-OBJC_EXPORT void objc_exception_try_exit(void *localExceptionData);
-OBJC_EXPORT id objc_exception_extract(void *localExceptionData);
-OBJC_EXPORT int objc_exception_match(Class exceptionClass, id exception);
+OBJC_EXPORT void
+objc_exception_throw(id _Nonnull exception)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
+
+OBJC_EXPORT void
+objc_exception_try_enter(void * _Nonnull localExceptionData)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
+
+OBJC_EXPORT void
+objc_exception_try_exit(void * _Nonnull localExceptionData)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
+
+OBJC_EXPORT id _Nonnull
+objc_exception_extract(void * _Nonnull localExceptionData)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
+
+OBJC_EXPORT int objc_exception_match(Class _Nonnull exceptionClass,
+                                     id _Nonnull exception)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
 
 
 typedef struct {
     int version;
-    void (*throw_exc)(id);		// version 0
-    void (*try_enter)(void *);	// version 0
-    void (*try_exit)(void *);	// version 0
-    id	 (*extract)(void *);	// version 0
-    int	(*match)(Class, id);	// version 0
-}
-    objc_exception_functions_t;
+    void (* _Nonnull throw_exc)(id _Nonnull);	          // version 0
+    void (* _Nonnull try_enter)(void * _Nonnull);         // version 0
+    void (* _Nonnull try_exit)(void * _Nonnull);          // version 0
+    id _Nonnull (* _Nonnull extract)(void * _Nonnull);    // version 0
+    int	(* _Nonnull match)(Class _Nonnull, id _Nonnull);  // version 0
+} objc_exception_functions_t;
 
 // get table; version tells how many
-OBJC_EXPORT void objc_exception_get_functions(objc_exception_functions_t *table);
+OBJC_EXPORT void
+objc_exception_get_functions(objc_exception_functions_t * _Nullable table)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
 
 // set table
-OBJC_EXPORT void objc_exception_set_functions(objc_exception_functions_t *table);
+OBJC_EXPORT void
+objc_exception_set_functions(objc_exception_functions_t * _Nullable table)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.3);
 
 
 // !__OBJC2__
 #else
 // __OBJC2__
 
-typedef id (*objc_exception_preprocessor)(id exception);
-typedef int (*objc_exception_matcher)(Class catch_type, id exception);
-typedef void (*objc_uncaught_exception_handler)(id exception);
-typedef void (*objc_exception_handler)(id unused, void *context);
-
-OBJC_EXPORT void objc_exception_throw(id exception);
-OBJC_EXPORT void objc_exception_rethrow(void);
-OBJC_EXPORT id objc_begin_catch(void *exc_buf);
-OBJC_EXPORT void objc_end_catch(void);
+typedef id _Nonnull (*objc_exception_preprocessor)(id _Nonnull exception);
+typedef int (*objc_exception_matcher)(Class _Nonnull catch_type,
+                                      id _Nonnull exception);
+typedef void (*objc_uncaught_exception_handler)(id _Null_unspecified /* _Nonnull */ exception);
+typedef void (*objc_exception_handler)(id _Nullable unused,
+                                       void * _Nullable context);
 
-OBJC_EXPORT objc_exception_preprocessor objc_setExceptionPreprocessor(objc_exception_preprocessor fn);
-OBJC_EXPORT objc_exception_matcher objc_setExceptionMatcher(objc_exception_matcher fn);
-OBJC_EXPORT objc_uncaught_exception_handler objc_setUncaughtExceptionHandler(objc_uncaught_exception_handler fn);
-
-#ifndef __arm__
-OBJC_EXPORT uintptr_t objc_addExceptionHandler(objc_exception_handler fn, void *context);
-OBJC_EXPORT void objc_removeExceptionHandler(uintptr_t token);
-#endif
+/** 
+ * Throw a runtime exception. This function is inserted by the compiler
+ * where \c @throw would otherwise be.
+ * 
+ * @param exception The exception to be thrown.
+ */
+OBJC_EXPORT void
+objc_exception_throw(id _Nonnull exception)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT void
+objc_exception_rethrow(void)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT id _Nonnull
+objc_begin_catch(void * _Nonnull exc_buf)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT void
+objc_end_catch(void)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT void
+objc_terminate(void)
+    OBJC_AVAILABLE(10.8, 6.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT objc_exception_preprocessor _Nonnull
+objc_setExceptionPreprocessor(objc_exception_preprocessor _Nonnull fn)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT objc_exception_matcher _Nonnull
+objc_setExceptionMatcher(objc_exception_matcher _Nonnull fn)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+OBJC_EXPORT objc_uncaught_exception_handler _Nonnull
+objc_setUncaughtExceptionHandler(objc_uncaught_exception_handler _Nonnull fn)
+    OBJC_AVAILABLE(10.5, 2.0, 9.0, 1.0, 2.0);
+
+// Not for iOS.
+OBJC_EXPORT uintptr_t
+objc_addExceptionHandler(objc_exception_handler _Nonnull fn,
+                         void * _Nullable context)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.5);
+
+OBJC_EXPORT void
+objc_removeExceptionHandler(uintptr_t token)
+    OBJC_OSX_AVAILABLE_OTHERS_UNAVAILABLE(10.5);
 
 // __OBJC2__
 #endif