kosaki	2011-07-22 21:53:42 +0900 (Fri, 22 Jul 2011)

  New Revision: 32629

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

  Log:
    merge revision(s) 32628:
    
    * vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
      of cfp consistency error problem on OS X 10.7 (Lion). It's
      suspected llvm optimization bug.
      [Bug #5076] [ruby-dev:44185]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/vm_insnhelper.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32628)
+++ ruby_1_9_3/ChangeLog	(revision 32629)
@@ -1,3 +1,10 @@
+Fri Jul 22 21:53:24 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
+	  of cfp consistency error problem on OS X 10.7 (Lion). It's
+	  suspected llvm optimization bug.
+	  [Bug #5076] [ruby-dev:44185]
+
 Fri Jul 22 21:50:16 2011  NARUSE, Yui  <naruse@r...>
 
 	* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
Index: ruby_1_9_3/vm_insnhelper.c
===================================================================
--- ruby_1_9_3/vm_insnhelper.c	(revision 32628)
+++ ruby_1_9_3/vm_insnhelper.c	(revision 32629)
@@ -387,7 +387,7 @@
 
 static inline VALUE
 vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp,
-	      int num, VALUE recv, const rb_block_t *blockptr,
+	      int num, volatile VALUE recv, const rb_block_t *blockptr,
 	      const rb_method_entry_t *me)
 {
     volatile VALUE val = 0;

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