From d49924ed81af7f5f00841ce7b4aa423a924d3af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= Date: Wed, 17 Jun 2020 16:05:43 +0900 Subject: [PATCH] rb_str_match: do not goto into a branch I'm not necessarily against every goto in general, but jumping into a branch is definitely a bad idea. Better refactor. --- string.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/string.c b/string.c index 2abb8296b3..8ccfac5a77 100644 --- a/string.c +++ b/string.c @@ -3864,15 +3864,13 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) static VALUE rb_str_match(VALUE x, VALUE y) { - if (SPECIAL_CONST_P(y)) goto generic; - switch (BUILTIN_TYPE(y)) { + switch (OBJ_BUILTIN_TYPE(y)) { case T_STRING: rb_raise(rb_eTypeError, "type mismatch: String given"); case T_REGEXP: return rb_reg_match(y, x); - generic: default: return rb_funcall(y, idEqTilde, 1, x); }