[macruby-changes] [729] MacRuby/trunk/objc.m

[source_changes at macosforge.org]

Revision: 729
          http://trac.macosforge.org/projects/ruby/changeset/729
Author:   lsansonetti at apple.com
Date:     2008-11-10 18:30:07 -0800 (Mon, 10 Nov 2008)
Log Message:
-----------
trying to isolate a weird crash

Modified Paths:
--------------
    MacRuby/trunk/objc.m

Modified: MacRuby/trunk/objc.m
===================================================================
--- MacRuby/trunk/objc.m	2008-11-11 02:21:29 UTC (rev 728)
+++ MacRuby/trunk/objc.m	2008-11-11 02:30:07 UTC (rev 729)
@@ -1710,6 +1710,9 @@
     return ((ffi_closure *)imp)->user_data;
 }
 
+extern void *_objc_msgForward;
+static void *_objc_msgForward_addr = NULL;
+
 NODE *
 rb_objc_method_node2(VALUE mod, SEL sel, IMP *pimp)
 {
@@ -1719,8 +1722,7 @@
 	*pimp = NULL;
 
     imp = class_getMethodImplementation((Class)mod, sel);
-    extern void *_objc_msgForward;
-    if (imp == (IMP)&_objc_msgForward)
+    if (imp == (IMP)_objc_msgForward_addr)
 	imp = NULL;
 
     if (pimp != NULL)
@@ -3397,6 +3399,8 @@
 	closure = rb_ruby_to_objc_closure("@@:@", 1, body->nd_body);
 	assert(class_addMethod((Class)klass, @selector(new:), (IMP)closure, "@@:@"));
     }
+    
+    _objc_msgForward_addr = &_objc_msgForward;
 }
 
 // for debug in gdb
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20081110/9bf1d9bc/attachment.html>