Optimize away to_s if it's already T_STRING

k0kubun · k0kubun · commit 38c6e182fba1 · 2022-11-04T00:07:17.000-07:00
[Feature #19102]
diff --git a/ext/erb/erb.c b/ext/erb/erb.c
@@ -68,9 +68,9 @@ optimized_escape_html(VALUE str)
 }
 
 static VALUE
-cgiesc_escape_html(VALUE self, VALUE str)
+erb_escape_html(VALUE self, VALUE str)
 {
-    StringValue(str);
+    str = rb_convert_type(str, T_STRING, "String", "to_s");
 
     if (rb_enc_str_asciicompat_p(str)) {
         return optimized_escape_html(str);
@@ -80,13 +80,6 @@ cgiesc_escape_html(VALUE self, VALUE str)
     }
 }
 
-static VALUE
-erb_escape_html(VALUE self, VALUE str)
-{
-    str = rb_funcall(str, rb_intern("to_s"), 0);
-    return cgiesc_escape_html(self, str);
-}
-
 void
 Init_erb(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ optimized_escape_html(VALUE str)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`static VALUE`
`71`		`-cgiesc_escape_html(VALUE self, VALUE str)`
	`71`	`+erb_escape_html(VALUE self, VALUE str)`
`72`	`72`	`{`
`73`		`- StringValue(str);`
	`73`	`+ str = rb_convert_type(str, T_STRING, "String", "to_s");`
`74`	`74`
`75`	`75`	`if (rb_enc_str_asciicompat_p(str)) {`
`76`	`76`	`return optimized_escape_html(str);`
`@@ -80,13 +80,6 @@ cgiesc_escape_html(VALUE self, VALUE str)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`-static VALUE`
`84`		`-erb_escape_html(VALUE self, VALUE str)`
`85`		`-{`
`86`		`- str = rb_funcall(str, rb_intern("to_s"), 0);`
`87`		`- return cgiesc_escape_html(self, str);`
`88`		`-}`
`89`		`-`
`90`	`83`	`void`
`91`	`84`	`Init_erb(void)`
`92`	`85`	`{`