diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 12:52:25 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 12:52:25 +0000 |
| commit | 5975e9e008111d82885946b104fbe3f8fb800160 (patch) | |
| tree | 6f0a4376ac08da82969681838a00601c4a1bbb4d | |
| parent | b5f91deee04aa6ccbe07c23c8222b937c22a799b (diff) | |
| download | ruby-5975e9e008111d82885946b104fbe3f8fb800160.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Jul 22 21:46:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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 <naruse@ruby-lang.org> * 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; |