naruse	2011-09-20 21:16:08 +0900 (Tue, 20 Sep 2011)

  New Revision: 33303

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

  Log:
    Avoid cfp consistency error by LLVM.
    
    volatile is not enough.

  Modified files:
    trunk/vm_insnhelper.c

Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 33302)
+++ vm_insnhelper.c	(revision 33303)
@@ -386,7 +386,7 @@
 }
 
 static inline VALUE
-vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp,
+vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
 	      int num, volatile VALUE recv, const rb_block_t *blockptr,
 	      const rb_method_entry_t *me)
 {
@@ -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(v)
+    RB_LLVM_GUARD(reg_cfp);
+#endif
 
     vm_pop_frame(th);
 

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