objc-sys: Merge exception-macos-x86.rs into exception.rs

Author: madsmtm

objc-sys/build.rs

@@ -67,6 +67,7 @@ fn main() {
     // println!("cargo:rustc-cfg=libobjc2_strict_apple_compat");
 
     let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
+    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
 
     let mut apple = env::var_os("CARGO_FEATURE_APPLE").is_some();
     let mut gnustep = env::var_os("CARGO_FEATURE_GNUSTEP_1_7").is_some();
@@ -138,12 +139,21 @@ fn main() {
     };
     println!("cargo:rustc-cfg={}", runtime_cfg);
 
+    if let Apple(runtime) = &runtime {
+        // A few things are defined differently depending on the __OBJC2__
+        // variable, which is set for all platforms except 32-bit macOS.
+        if let (MacOS(_), "x86") = (runtime, &*target_arch) {
+            println!("cargo:rustc-cfg=apple_old");
+        } else {
+            println!("cargo:rustc-cfg=apple_new");
+        }
+    }
+
     let clang_runtime = match &runtime {
         Apple(runtime) => {
             // The fragile runtime is expected on i686-apple-darwin, see:
             // https://github.com/llvm/llvm-project/blob/release/13.x/clang/lib/Driver/ToolChains/Darwin.h#L228-L231
             // https://github.com/llvm/llvm-project/blob/release/13.x/clang/lib/Driver/ToolChains/Clang.cpp#L3639-L3640
-            let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();
             let clang_runtime_str = match (runtime, &*target_arch) {
                 (MacOS(_), "x86") => "macosx-fragile",
                 (MacOS(_), _) => "macosx",

objc-sys/src/exception-macos-x86.rs

@@ -4,27 +4,27 @@
 //!   think it's fine...
 #[cfg(any(not(objfw), feature = "unstable-exception"))]
 use core::ffi::c_void;
-#[cfg(apple)]
+#[cfg(apple_new)]
 use std::os::raw::c_int;
 #[cfg(feature = "unstable-exception")]
 use std::os::raw::c_uchar;
 
-#[cfg(apple)]
+#[cfg(apple_new)]
 use crate::objc_class;
 use crate::objc_object;
 
 /// Remember that this is non-null!
-#[cfg(apple)]
+#[cfg(apple_new)]
 pub type objc_exception_matcher =
     unsafe extern "C" fn(catch_type: *mut objc_class, exception: *mut objc_object) -> c_int;
 
 /// Remember that this is non-null!
-#[cfg(apple)]
+#[cfg(apple_new)]
 pub type objc_exception_preprocessor =
     unsafe extern "C" fn(exception: *mut objc_object) -> *mut objc_object;
 
 /// Remember that this is non-null!
-#[cfg(apple)]
+#[cfg(apple_new)]
 pub type objc_uncaught_exception_handler = unsafe extern "C" fn(exception: *mut objc_object);
 
 #[cfg(objfw)]
@@ -34,40 +34,52 @@ pub type objc_uncaught_exception_handler =
 /// Only available on macOS.
 ///
 /// Remember that this is non-null!
-#[cfg(all(apple, target_os = "macos"))]
+#[cfg(all(apple_new, target_os = "macos"))]
 pub type objc_exception_handler =
     unsafe extern "C" fn(unused: *mut objc_object, context: *mut c_void);
 
 extern_c! {
-    #[cfg(not(objfw))]
+    #[cfg(any(gnustep, apple_new))]
     pub fn objc_begin_catch(exc_buf: *mut c_void) -> *mut objc_object;
-    #[cfg(not(objfw))]
+    #[cfg(any(gnustep, apple_new))]
     pub fn objc_end_catch();
     /// See [`objc-exception.h`].
     ///
     /// [`objc-exception.h`]: https://github.com/apple-oss-distributions/objc4/blob/objc4-818.2/runtime/objc-exception.h
     pub fn objc_exception_throw(exception: *mut objc_object) -> !;
-    #[cfg(apple)]
+    #[cfg(apple_new)]
     pub fn objc_exception_rethrow() -> !;
+
+    #[cfg(apple_old)]
+    pub fn objc_exception_try_enter(exception_data: *const c_void);
+
+    #[cfg(apple_old)]
+    pub fn objc_exception_try_exit(exception_data: *const c_void);
+
+    // objc_exception_extract
+    // objc_exception_match
+    // objc_exception_get_functions
+    // objc_exception_set_functions
+
     #[cfg(any(gnustep, winobjc))]
     pub fn objc_exception_rethrow(exc_buf: *mut c_void) -> !;
 
-    #[cfg(apple)]
+    #[cfg(apple_new)]
     pub fn objc_setExceptionMatcher(f: objc_exception_matcher) -> objc_exception_matcher;
-    #[cfg(apple)]
+    #[cfg(apple_new)]
     pub fn objc_setExceptionPreprocessor(
         f: objc_exception_preprocessor,
     ) -> objc_exception_preprocessor;
-    #[cfg(any(apple, objfw))]
+    #[cfg(any(apple_new, objfw))]
     pub fn objc_setUncaughtExceptionHandler(
         f: objc_uncaught_exception_handler,
     ) -> objc_uncaught_exception_handler;
 
     /// Only available on macOS.
-    #[cfg(all(apple, target_os = "macos"))]
+    #[cfg(all(apple_new, target_os = "macos"))]
     pub fn objc_addExceptionHandler(f: objc_exception_handler, context: *mut c_void) -> usize;
     /// Only available on macOS.
-    #[cfg(all(apple, target_os = "macos"))]
+    #[cfg(all(apple_new, target_os = "macos"))]
     pub fn objc_removeExceptionHandler(token: usize);
 
     // Only available when ENABLE_OBJCXX is set, and a useable C++ runtime is

objc-sys/src/exception.rs

@@ -93,12 +93,7 @@ macro_rules! extern_c {
 mod class;
 mod constants;
 
-#[cfg(not(all(apple, target_os = "macos", target_arch = "x86")))]
 mod exception;
-#[cfg(all(apple, target_os = "macos", target_arch = "x86"))]
-#[path = "exception-macos-x86.rs"]
-mod exception;
-
 mod message;
 mod method;
 mod object;

objc-sys/src/lib.rs

@@ -24,14 +24,14 @@ pub type IMP = Option<unsafe extern "C" fn()>;
 // /// Not available on macOS x86.
 // ///
 // /// Remember that this is non-null!
-// #[cfg(all(apple, not(all(target_os = "macos", target_arch = "x86"))))]
+// #[cfg(apple_new)]
 // pub type objc_hook_getClass =
 //     unsafe extern "C" fn(name: *const c_char, out_cls: *mut *const crate::objc_class) -> BOOL;
 //
 // /// Not available on macOS x86.
 // ///
 // /// Remember that this is non-null!
-// #[cfg(all(apple, not(all(target_os = "macos", target_arch = "x86"))))]
+// #[cfg(apple_new)]
 // pub type objc_hook_lazyClassNamer =
 //     unsafe extern "C" fn(cls: *const crate::objc_class) -> *const c_char;
 
@@ -94,7 +94,7 @@ extern_c! {
     // /// Not available on macOS x86.
     // ///
     // /// Remember that this is non-null!
-    // #[cfg(all(apple, not(all(target_os = "macos", target_arch = "x86"))))]
+    // #[cfg(apple_new)]
     // pub fn objc_setHook_getClass(
     //     new_value: objc_hook_getClass,
     //     out_old_value: *mut objc_hook_getClass,
@@ -103,7 +103,7 @@ extern_c! {
     // /// Not available on macOS x86.
     // ///
     // /// Remember that this is non-null!
-    // #[cfg(all(apple, not(all(target_os = "macos", target_arch = "x86"))))]
+    // #[cfg(apple_new)]
     // pub fn objc_setHook_lazyClassNamer(
     //     new_value: objc_hook_lazyClassNamer,
     //     out_old_value: *mut objc_hook_lazyClassNamer,