X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-mach-helper.c;h=db1e5b9fce9fe7fee582d6437afedf335c07f356;hb=b9e7bcabe48cd0d9f282a2eebe6ab9a8a010d9b0;hp=ec4220838f2939a4da12e6a91ef51f7cd7964d67;hpb=90d6059c5475419ddf6e0fc4b49098158010cab0;p=mono.git

diff --git a/mono/utils/mono-threads-mach-helper.c b/mono/utils/mono-threads-mach-helper.c
index ec4220838f2..db1e5b9fce9 100644
--- a/mono/utils/mono-threads-mach-helper.c
+++ b/mono/utils/mono-threads-mach-helper.c
@@ -1,5 +1,6 @@
-/*
- * mono-threads-mach-helper.c: ObjectiveC hacks to improve our changes with thread shutdown
+/**
+ * \file
+ * ObjectiveC hacks to improve our changes with thread shutdown
  *
  * Author:
  *	Rodrigo Kumpera (kumpera@gmail.com)
@@ -11,6 +12,7 @@
 
 #if defined(__MACH__)
 
+#include <stdio.h>
 #include <objc/runtime.h>
 #include <objc/message.h>
 #include <mono/utils/mono-compiler.h>
@@ -20,9 +22,9 @@
  * which conflicts with objc.
  * Hence the hack here.
 */
-void mono_threads_init_dead_letter (void) MONO_INTERNAL;
-void mono_threads_install_dead_letter (void) MONO_INTERNAL;
-void mono_thread_info_detach (void) MONO_INTERNAL;
+void mono_threads_init_dead_letter (void);
+void mono_threads_install_dead_letter (void);
+void mono_thread_info_detach (void);
 
 static Class nsobject, nsthread, mono_dead_letter_class;
 static SEL dealloc, release, currentThread, threadDictionary, init, alloc, objectForKey, setObjectForKey;
@@ -66,13 +68,25 @@ mono_threads_install_dead_letter (void)
 {
 	id cur, dict;
 
+	/*
+	 * See the 'Dispatch Objective-C Messages Using the Method Function’s Prototype' section in
+	 * the '64-Bit Transition Guide for Cocoa Touch' as to why this is required.
+	 *
+	 * It doesn't hurt on other architectures either, so no need to #ifdef it only for ARM64.
+	 */
+
+	id (*id_objc_msgSend_id)(id, SEL, id) = (id (*)(id, SEL, id)) objc_msgSend;
+	void (*objc_msgSend_id_id)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend;
+
 	cur = objc_msgSend ((id)nsthread, currentThread);
 	if (!cur)
 		return;
 	dict = objc_msgSend (cur, threadDictionary);
-	if (dict && objc_msgSend (dict, objectForKey, mono_dead_letter_key) == nil) {
+	if (dict && id_objc_msgSend_id (dict, objectForKey, mono_dead_letter_key) == nil) {
 		id value = objc_msgSend (objc_msgSend ((id)mono_dead_letter_class, alloc), init);
-		objc_msgSend (dict, setObjectForKey, value, mono_dead_letter_key);
+
+		objc_msgSend_id_id (dict, setObjectForKey, value, mono_dead_letter_key);
+
 		objc_msgSend (value, release);
 	}
 }
@@ -80,10 +94,11 @@ mono_threads_install_dead_letter (void)
 void
 mono_threads_init_dead_letter (void)
 {
-	id nsstring = objc_getClass ("NSString");
-	id nsautoreleasepool = objc_getClass ("NSAutoreleasePool");
+	id nsstring = (id) objc_getClass ("NSString");
+	id nsautoreleasepool = (id) objc_getClass ("NSAutoreleasePool");
 	SEL stringWithUTF8String = sel_registerName ("stringWithUTF8String:");
 	SEL retain = sel_registerName ("retain");
+	id pool;
 
 	nsthread = (Class)objc_getClass ("NSThread");
 	nsobject = (Class)objc_getClass ("NSObject");
@@ -105,8 +120,11 @@ mono_threads_init_dead_letter (void)
 	objc_registerClassPair (mono_dead_letter_class);
 
 	// create the dict key
-	id pool = objc_msgSend (objc_msgSend (nsautoreleasepool, alloc), init);
-	mono_dead_letter_key = objc_msgSend (nsstring, stringWithUTF8String, "mono-dead-letter");
+	pool = objc_msgSend (objc_msgSend (nsautoreleasepool, alloc), init);
+
+	id (*objc_msgSend_char)(id, SEL, const char*) = (id (*)(id, SEL, const char*)) objc_msgSend;
+	mono_dead_letter_key = objc_msgSend_char (nsstring, stringWithUTF8String, "mono-dead-letter");
+
 	objc_msgSend (mono_dead_letter_key, retain);
 	objc_msgSend (pool, release);
 }