naruse	2011-09-21 00:04:07 +0900 (Wed, 21 Sep 2011)

  New Revision: 33304

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

  Log:
    merge revision(s) r33303:
    ------------------------------------------------------------------------
    r33303 | naruse | 2011-09-20 21:16:08 +0900 (Tue, 20 Sep 2011) | 3 lines
    
    Avoid cfp consistency error by LLVM.
    
    volatile is not enough.
    ------------------------------------------------------------------------

  Modified files:
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/vm_insnhelper.c

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 33303)
+++ ruby_1_9_3/version.h	(revision 33304)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-17"
+#define RUBY_RELEASE_DATE "2011-09-21"
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/vm_insnhelper.c
===================================================================
--- ruby_1_9_3/vm_insnhelper.c	(revision 33303)
+++ ruby_1_9_3/vm_insnhelper.c	(revision 33304)
@@ -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/