diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 12:53:42 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-22 12:53:42 +0000 |
| commit | b44970a0b738cf63f888e8d55c82f63b0e1af346 (patch) | |
| tree | 0a924ef5fe27b4ade75703272068dfa3b6e3bb42 /vm_insnhelper.c | |
| parent | 7ea6334d4cff81101a1f90fecf05c1372558d550 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |