Skip a redundant check for the rb_obj_hash case

Also, refactor the cfunc struct to use a new rb_cfunc_t.

1 files changed, 3 insertions, 3 deletions

diff --git a/hash.c b/hash.c
index 437fb83fc2..32b0b10e9c 100644
--- a/hash.c
+++ b/hash.c
@@ -220,12 +220,12 @@ obj_any_hash(VALUE obj)
     VALUE klass = CLASS_OF(obj);
     if (klass) {
         const rb_callable_method_entry_t *cme = rb_callable_method_entry(klass, id_hash);
-        if (cme && METHOD_ENTRY_BASIC(cme) && RBASIC_CLASS(cme->defined_class) == rb_mKernel) {
+        if (cme && METHOD_ENTRY_BASIC(cme)) {
             // Optimize away the frame push overhead if it's the default Kernel#hash
-            if (cme->def->type == VM_METHOD_TYPE_CFUNC && cme->def->body.cfunc.func == (VALUE (*)(ANYARGS))rb_obj_hash) {
+            if (cme->def->type == VM_METHOD_TYPE_CFUNC && cme->def->body.cfunc.func == (rb_cfunc_t)rb_obj_hash) {
                 hval = rb_obj_hash(obj);
             }
-            else {
+            else if (RBASIC_CLASS(cme->defined_class) == rb_mKernel) {
                 hval = rb_vm_call0(GET_EC(), obj, id_hash, 0, 0, cme, 0);
             }
         }