kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (do_coerce): speed optimization by using rb_check_funcall

Browse source 
instead of rb_rescue + rb_funcall.
  This fix is based on the patch by Benoit Daloze.
  [Bug #7645] [ruby-core:51213]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2013-01-10 06:30:23 +00:00
parent 9ef6eefbd3
commit 9aa75d08ce
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Jan 10 11:15:04 2013 Kenta Murata <mrkn@cookpad.com>
* numeric.c (do_coerce): speed optimization by using rb_check_funcall
instead of rb_rescue + rb_funcall.
This fix is based on the patch by Benoit Daloze.
[Bug #7645] [ruby-core:51213]
Thu Jan 10 11:15:04 2013 Aaron Patterson <aaron@tenderlovemaking.com> Thu Jan 10 11:15:04 2013 Aaron Patterson <aaron@tenderlovemaking.com>
* probes.d: updating probes to be more symmetrical, adding * probes.d: updating probes to be more symmetrical, adding

33
numeric.c
View file

@ -211,25 +211,6 @@ num_coerce(VALUE x, VALUE y)
return rb_assoc_new(y, x); return rb_assoc_new(y, x);
} }
static VALUE
coerce_body(VALUE *x)
{
return rb_funcall(x[1], id_coerce, 1, x[0]);
}
static VALUE
coerce_rescue(VALUE *x)
{
volatile VALUE v = rb_inspect(x[1]);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
rb_special_const_p(x[1])?
RSTRING_PTR(v):
rb_obj_classname(x[1]),
rb_obj_classname(x[0]));
return Qnil; /* dummy */
}
static int static int
do_coerce(VALUE *x, VALUE *y, int err) do_coerce(VALUE *x, VALUE *y, int err)
{ {
@ -238,7 +219,19 @@ do_coerce(VALUE *x, VALUE *y, int err)
a[0] = *x; a[1] = *y; a[0] = *x; a[1] = *y;
ary = rb_rescue(coerce_body, (VALUE)a, err?coerce_rescue:0, (VALUE)a); ary = rb_check_funcall(*y, id_coerce, 1, x);
if (ary == Qundef) {
if (err) {
volatile VALUE v = rb_inspect(*y);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
rb_special_const_p(*y)?
RSTRING_PTR(v):
rb_obj_classname(*y),
rb_obj_classname(*x));
}
return FALSE; /* dummy */
}
if (!RB_TYPE_P(ary, T_ARRAY) || RARRAY_LEN(ary) != 2) { if (!RB_TYPE_P(ary, T_ARRAY) || RARRAY_LEN(ary) != 2) {
if (err) { if (err) {
rb_raise(rb_eTypeError, "coerce must return [x, y]"); rb_raise(rb_eTypeError, "coerce must return [x, y]");