Fast retain. Refs #1

yury · Jun 17, 2023 · e351a62 · e351a62
1 parent 8c78b80
commit e351a62
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cidre/src/arc.rs b/cidre/src/arc.rs
@@ -3,7 +3,6 @@ use crate::objc;
 
 #[cfg(feature = "objc")]
 use std::{
-    arch::asm,
     ops::{Deref, DerefMut},
     ptr::NonNull,
 };
@@ -177,6 +176,8 @@ pub type Rar<T> = ReturnedAutoReleased<T>;
 #[cfg(feature = "objc")]
 #[inline]
 pub fn rar_retain_option<T: objc::Obj>(id: Option<Rar<T>>) -> Option<R<T>> {
+    use std::arch::asm;
+
     unsafe {
         // see comments in rar_retain
         asm!("mov x29, x29");
@@ -189,6 +190,8 @@ pub fn rar_retain_option<T: objc::Obj>(id: Option<Rar<T>>) -> Option<R<T>> {
 #[cfg(feature = "objc")]
 #[inline]
 pub fn rar_retain<T: objc::Obj>(id: Rar<T>) -> R<T> {
+    use std::arch::asm;
+
     unsafe {
         // latest runtimes don't need this marker anymore.
         // see https://developer.apple.com/videos/play/wwdc2022/110363/ at 13:24

diff --git a/cidre/src/objc.rs b/cidre/src/objc.rs
@@ -73,7 +73,15 @@ impl<T: Obj> arc::Retain for T {
 pub trait Obj: Sized + arc::Retain {
     #[inline]
     unsafe fn retain(id: &Self) -> arc::R<Self> {
-        transmute(objc_retain(transmute(id)))
+        let result: *mut Self;
+        core::arch::asm!(
+            "bl _objc_retain_{obj:x}",
+            obj = in(reg) id,
+            lateout("x0") result,
+            clobber_abi("C"),
+        );
+        transmute(result)
+        // transmute(objc_retain(transmute(id)))
     }
 
     #[msg_send(description)]
@@ -158,7 +166,7 @@ where
 
 #[link(name = "objc", kind = "dylib")]
 extern "C" {
-    fn objc_retain<'a>(obj: &Id) -> &'a Id;
+    // fn objc_retain<'a>(obj: &Id) -> &'a Id;
     // fn objc_release(obj: &mut Id);
 
     fn class_createInstance(cls: &Class<Id>, extra_bytes: usize) -> Option<arc::A<Id>>;