1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_insnhelper.c (vm_call_cfunc): revert r33112. RB_GC_GUARD macro

Browse Source 
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
This commit is contained in:
usa 2011-08-30 13:28:58 +00:00
parent 28bba481f9
commit 13d3a16ada
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Tue Aug 30 11:06:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).

3
vm_insnhelper.c
View File

@ -386,7 +386,7 @@ call_cfunc(VALUE (*func)(), VALUE recv,
} }
static inline VALUE 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, int num, volatile VALUE recv, const rb_block_t *blockptr,
const rb_method_entry_t *me) 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) { if (reg_cfp != th->cfp + 1) {
rb_bug("cfp consistency error - send"); rb_bug("cfp consistency error - send");
} }
RB_GC_GUARD(reg_cfp);
vm_pop_frame(th); vm_pop_frame(th);