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

Symbol support for opt_eql_func too

Browse Source 
* vm_insnhelper.c (comparable_by_identity): extract the condition
  where comparable by identity.  currently both are same types,
  Fixnum, Flonum, or Symbol.

* vm_insnhelper.c (opt_eql_func): support Symbol too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-05-26 06:28:38 +00:00
parent ad0f8ff76c
commit 2881374caf
1 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
vm_insnhelper.c
View File

@ -1295,9 +1295,43 @@ check_cfunc(const rb_callable_method_entry_t *me, VALUE (*func)())
} }
} }
static inline int
vm_method_cfunc_is(CALL_INFO ci, CALL_CACHE cc,
VALUE recv, VALUE (*func)())
{
vm_search_method(ci, cc, recv);
return check_cfunc(cc->me, func);
}
static VALUE
opt_equal_fallback(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc)
{
if (vm_method_cfunc_is(ci, cc, recv, rb_obj_equal)) {
return recv == obj ? Qtrue : Qfalse;
}
return Qundef;
}
#define BUILTIN_CLASS_P(x, k) (!SPECIAL_CONST_P(x) && RBASIC_CLASS(x) == k) #define BUILTIN_CLASS_P(x, k) (!SPECIAL_CONST_P(x) && RBASIC_CLASS(x) == k)
#define EQ_UNREDEFINED_P(t) BASIC_OP_UNREDEFINED_P(BOP_EQ, t##_REDEFINED_OP_FLAG) #define EQ_UNREDEFINED_P(t) BASIC_OP_UNREDEFINED_P(BOP_EQ, t##_REDEFINED_OP_FLAG)
/* 1: compare by identity, 0: not applicable, -1: redefined */
static inline int
comparable_by_identity(VALUE recv, VALUE obj)
{
if (FIXNUM_2_P(recv, obj)) {
return (EQ_UNREDEFINED_P(INTEGER) != 0) * 2 - 1;
}
if (FLONUM_2_P(recv, obj)) {
return (EQ_UNREDEFINED_P(FLOAT) != 0) * 2 - 1;
}
if (SYMBOL_P(recv) && SYMBOL_P(obj)) {
return (EQ_UNREDEFINED_P(SYMBOL) != 0) * 2 - 1;
}
return 0;
}
static static
#ifndef NO_BIG_INLINE #ifndef NO_BIG_INLINE
inline inline
@ -1305,15 +1339,13 @@ inline
VALUE VALUE
opt_eq_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc) opt_eq_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc)
{ {
if (FIXNUM_2_P(recv, obj)) { switch (comparable_by_identity(recv, obj)) {
if (EQ_UNREDEFINED_P(INTEGER)) { case 1:
return (recv == obj) ? Qtrue : Qfalse; return (recv == obj) ? Qtrue : Qfalse;
} case -1:
goto fallback;
} }
else if (FLONUM_2_P(recv, obj)) { if (0) {
if (EQ_UNREDEFINED_P(FLOAT)) {
return (recv == obj) ? Qtrue : Qfalse;
}
} }
else if (BUILTIN_CLASS_P(recv, rb_cFloat)) { else if (BUILTIN_CLASS_P(recv, rb_cFloat)) {
if (EQ_UNREDEFINED_P(FLOAT)) { if (EQ_UNREDEFINED_P(FLOAT)) {
@ -1325,21 +1357,9 @@ opt_eq_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc)
return rb_str_equal(recv, obj); return rb_str_equal(recv, obj);
} }
} }
else if (SYMBOL_P(recv) && SYMBOL_P(obj)) {
if (EQ_UNREDEFINED_P(SYMBOL)) {
return (recv == obj) ? Qtrue : Qfalse;
}
}
{ fallback:
vm_search_method(ci, cc, recv); return opt_equal_fallback(recv, obj, ci, cc);
if (check_cfunc(cc->me, rb_obj_equal)) {
return recv == obj ? Qtrue : Qfalse;
}
}
return Qundef;
} }
static static
@ -1349,15 +1369,13 @@ inline
VALUE VALUE
opt_eql_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc) opt_eql_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc)
{ {
if (FIXNUM_2_P(recv, obj)) { switch (comparable_by_identity(recv, obj)) {
if (EQ_UNREDEFINED_P(INTEGER)) { case 1:
return (recv == obj) ? Qtrue : Qfalse; return (recv == obj) ? Qtrue : Qfalse;
} case -1:
goto fallback;
} }
else if (FLONUM_2_P(recv, obj)) { if (0) {
if (EQ_UNREDEFINED_P(FLOAT)) {
return (recv == obj) ? Qtrue : Qfalse;
}
} }
else if (BUILTIN_CLASS_P(recv, rb_cFloat)) { else if (BUILTIN_CLASS_P(recv, rb_cFloat)) {
if (EQ_UNREDEFINED_P(FLOAT)) { if (EQ_UNREDEFINED_P(FLOAT)) {
@ -1370,15 +1388,8 @@ opt_eql_func(VALUE recv, VALUE obj, CALL_INFO ci, CALL_CACHE cc)
} }
} }
{ fallback:
vm_search_method(ci, cc, recv); return opt_equal_fallback(recv, obj, ci, cc);
if (check_cfunc(cc->me, rb_obj_equal)) {
return recv == obj ? Qtrue : Qfalse;
}
}
return Qundef;
} }
#undef BUILTIN_CLASS_P #undef BUILTIN_CLASS_P
#undef EQ_UNREDEFINED_P #undef EQ_UNREDEFINED_P
@ -3465,14 +3476,6 @@ vm_opt_mod(VALUE recv, VALUE obj)
} }
} }
static inline int
vm_method_cfunc_is(CALL_INFO ci, CALL_CACHE cc,
VALUE recv, VALUE (*func)())
{
vm_search_method(ci, cc, recv);
return check_cfunc(cc->me, func);
}
static VALUE static VALUE
vm_opt_neq(CALL_INFO ci, CALL_CACHE cc, vm_opt_neq(CALL_INFO ci, CALL_CACHE cc,
CALL_INFO ci_eq, CALL_CACHE cc_eq, CALL_INFO ci_eq, CALL_CACHE cc_eq,