From 5975e9e008111d82885946b104fbe3f8fb800160 Mon Sep 17 00:00:00 2001 From: kosaki Date: Fri, 22 Jul 2011 12:52:25 +0000 Subject: * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ vm_insnhelper.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1e0bb5689e..9b70da96e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 22 21:46:54 2011 KOSAKI Motohiro + + * 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:18:20 2011 NARUSE, Yui * lib/uri/generic.rb (WFKV_): unroll the loop of regexp. diff --git a/vm_insnhelper.c b/vm_insnhelper.c index c7782149b8..a35dbb1196 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -387,7 +387,7 @@ call_cfunc(VALUE (*func)(), VALUE recv, 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; -- cgit v1.2.3