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

string.c (rb_str_format_m): trade volatile for RB_GC_GUARD

Browse Source 
* string.c (rb_str_format_m): trade volatile for RB_GC_GUARD
  RB_GC_GUARD meaning is clear and has better code generation.
  [ruby-core:60688]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-02-14 09:42:14 +00:00
parent 4e3522e9fb
commit f7cff3a940
2 changed files with 10 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 @@
Fri Feb 14 18:38:46 2014 Eric Wong <e@80x24.org>
* string.c (rb_str_format_m): trade volatile for RB_GC_GUARD
RB_GC_GUARD meaning is clear and has better code generation.
[ruby-core:60688]
Thu Feb 13 23:30:30 2014 Shugo Maeda <shugo@ruby-lang.org> Thu Feb 13 23:30:30 2014 Shugo Maeda <shugo@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): should check ci->me->flag of * vm_insnhelper.c (vm_call_method): should check ci->me->flag of

6
string.c
View File

@ -1401,10 +1401,12 @@ rb_str_times(VALUE str, VALUE times)
static VALUE static VALUE
rb_str_format_m(VALUE str, VALUE arg) rb_str_format_m(VALUE str, VALUE arg)
{ {
volatile VALUE tmp = rb_check_array_type(arg); VALUE tmp = rb_check_array_type(arg);
if (!NIL_P(tmp)) { if (!NIL_P(tmp)) {
return rb_str_format(RARRAY_LENINT(tmp), RARRAY_CONST_PTR(tmp), str); VALUE rv = rb_str_format(RARRAY_LENINT(tmp), RARRAY_CONST_PTR(tmp), str);
RB_GC_GUARD(tmp);
return rv;
} }
return rb_str_format(1, &arg, str); return rb_str_format(1, &arg, str);
} }