From 0378b33aa6eff3940e16eb311023cc6c2ef00f77 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 30 Jan 2019 08:57:59 +0100 Subject: [PATCH] [generator] Treat arm64_32 as arm64 when dealing with objc_msgSend behavior. --- src/generator.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/generator.cs b/src/generator.cs index f084a92571..b820d38e9c 100644 --- a/src/generator.cs +++ b/src/generator.cs @@ -3863,7 +3863,12 @@ public partial class Generator : IMemberGatherer { if (is_stret_multi) { print ("if (Runtime.Arch == Arch.DEVICE) {"); indent++; - print ("if (IntPtr.Size == 8) {"); + if (BindingTouch.CurrentPlatform == PlatformName.WatchOS) { + print ("if (global::ObjCRuntime.Runtime.IsARM64CallingConvention) {"); + } else { + print ("if (IntPtr.Size == 8) {"); + + } indent++; GenerateInvoke (false, supercall, mi, minfo, selector, args [index64], assign_to_temp, category_type, false, EnumMode.Bit64); indent--;