tenderlove	2011-10-28 03:02:42 +0900 (Fri, 28 Oct 2011)

  New Revision: 33540

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33540

  Log:
    * vm_insnhelper.c (vm_call_cfunc): adding back useless hack.  For some
      reason, this fixes CFP errors on OS X 10.7.

  Modified files:
    trunk/ChangeLog
    trunk/vm_insnhelper.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33539)
+++ ChangeLog	(revision 33540)
@@ -1,3 +1,8 @@
+Fri Oct 28 03:01:27 2011  Aaron Patterson <aaron@t...>
+
+	* vm_insnhelper.c (vm_call_cfunc): adding back useless hack.  For some
+	  reason, this fixes CFP errors on OS X 10.7.
+
 Fri Oct 28 00:09:31 2011  Tanaka Akira  <akr@f...>
 
 	* ext/sdbm/_sdbm.c (sdbm_prep): refactored for less nesting.
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 33539)
+++ vm_insnhelper.c	(revision 33540)
@@ -406,6 +406,10 @@
     if (reg_cfp != th->cfp + 1) {
 	rb_bug("cfp consistency error - send");
     }
+#ifdef __llvm__
+#define RB_LLVM_GUARD(v) (*RB_GC_GUARD_PTR((volatile VALUE *)&(v)))
+    RB_LLVM_GUARD(reg_cfp);
+#endif
 
     vm_pop_frame(th);
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/