diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 13:28:58 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 13:28:58 +0000 |
| commit | 13d3a16ada7e154647d9abdc203e3b19ee328ccd (patch) | |
| tree | 8e98972b4195ad5e4848da0d354206897808255e | |
| parent | 28bba481f952a96024a76f976d1cd4343d78706c (diff) | |
* vm_insnhelper.c (vm_call_cfunc): revert r33112. RB_GC_GUARD macro
protect a VALUE from GC. It's not for general anti-optimizing
purpose.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | vm_insnhelper.c | 3 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Aug 30 22:25:38 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * vm_insnhelper.c (vm_call_cfunc): revert r33112. RB_GC_GUARD macro + protect a VALUE from GC. It's not for general anti-optimizing + purpose. + Tue Aug 30 11:06:19 2011 NARUSE, Yui <naruse@ruby-lang.org> * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 38e6a006a5..9410963d5c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -386,7 +386,7 @@ call_cfunc(VALUE (*func)(), VALUE recv, } static inline VALUE -vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, +vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp, int num, volatile VALUE recv, const rb_block_t *blockptr, const rb_method_entry_t *me) { @@ -406,7 +406,6 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, if (reg_cfp != th->cfp + 1) { rb_bug("cfp consistency error - send"); } - RB_GC_GUARD(reg_cfp); vm_pop_frame(th); |