Support msg_send_id![super, ...] for all non-ARC selectors

Author: madsmtm

objc2/src/__macro_helpers.rs

@@ -23,6 +23,16 @@ pub trait MsgSendId<T, U> {
     ) -> Result<Option<U>, MessageError>;
 }
 
+#[doc(hidden)]
+pub trait MsgSendSuperId<T, U> {
+    unsafe fn send_super_message_id<A: MessageArguments>(
+        obj: T,
+        superclass: &Class,
+        sel: Sel,
+        args: A,
+    ) -> Result<Option<U>, MessageError>;
+}
+
 // `new`
 impl<T: ?Sized + Message, O: Ownership> MsgSendId<&'_ Class, Id<T, O>>
     for Assert<true, false, false, false>
@@ -104,6 +114,26 @@ impl<T: MessageReceiver, U: Message, O: Ownership> MsgSendId<T, Id<U, O>>
     }
 }
 
+// Super: All other selectors
+impl<T: MessageReceiver, U: Message, O: Ownership> MsgSendSuperId<T, Id<U, O>>
+    for Assert<false, false, false, false>
+{
+    #[inline(always)]
+    unsafe fn send_super_message_id<A: MessageArguments>(
+        obj: T,
+        superclass: &Class,
+        sel: Sel,
+        args: A,
+    ) -> Result<Option<Id<U, O>>, MessageError> {
+        // All code between the message send and the `retain_autoreleased`
+        // must be able to be optimized away for this to work.
+        unsafe {
+            MessageReceiver::send_super_message(obj, superclass, sel, args)
+                .map(|r| Id::retain_autoreleased(r))
+        }
+    }
+}
+
 // https://clang.llvm.org/docs/AutomaticReferenceCounting.html#arc-method-families
 #[doc(hidden)]
 pub const fn in_method_family(mut selector: &[u8], mut family: &[u8]) -> bool {
@@ -206,6 +236,18 @@ mod tests {
         let _desc: Option<Id<Object, Shared>> = unsafe { msg_send_id![&obj, description] };
     }
 
+    #[test]
+    fn test_msg_send_super_id() {
+        // We send the messages to the class itself instead of it's actual
+        // superclass, just to verify that the macro works.
+        // TODO: Better solution!
+        let cls = class!(NSObject);
+        let obj: Id<Object, Owned> = unsafe { msg_send_id![cls, new].unwrap() };
+
+        let _desc: Option<Id<Object, Shared>> =
+            unsafe { msg_send_id![super(&obj, cls), description] };
+    }
+
     #[test]
     fn test_in_method_family() {
         // Common cases

objc2/src/macros.rs

@@ -239,6 +239,28 @@ macro_rules! msg_send_bool {
 /// [`Id::autorelease`]: crate::rc::Id::autorelease
 #[macro_export]
 macro_rules! msg_send_id {
+    [super($obj:expr, $superclass:expr), $selector:ident $(,)?] => ({
+        let sel = $crate::sel!($selector);
+        const NAME: &[u8] = stringify!($selector).as_bytes();
+        $crate::msg_send_id!(@__get_assert_consts NAME);
+        let result: Option<$crate::rc::Id<_, _>>;
+        match <X as $crate::__macro_helpers::MsgSendSuperId<_, _>>::send_super_message_id($obj, $superclass, sel, ()) {
+            Err(s) => panic!("{}", s),
+            Ok(r) => result = r,
+        }
+        result
+    });
+    [super($obj:expr, $superclass:expr), $($selector:ident : $argument:expr),+ $(,)?] => ({
+        let sel = $crate::sel!($($selector:)+);
+        const NAME: &[u8] = concat!($(stringify!($selector), ':'),+).as_bytes();
+        $crate::msg_send_id!(@__get_assert_consts NAME);
+        let result: Option<$crate::rc::Id<_, _>>;
+        match <X as $crate::__macro_helpers::MsgSendSuperId<_, _>>::send_super_message_id($obj, $superclass, sel, ($($argument,)+)) {
+            Err(s) => panic!("{}", s),
+            Ok(r) => result = r,
+        }
+        result
+    });
     [$obj:expr, retain $(,)?] => ({
         $crate::__macro_helpers::compile_error!(
             "msg_send_id![obj, retain] is not supported. Use `Id::retain` instead"