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

[flori/json] Optimize key type check in json_object_i

Browse Source 
Rather than checking the class we can check the type.
This is very subtly different for String subclasses, but I think it's
OK.

We also save on checking the type again in the fast path.

https://github.com/flori/json/commit/772a0201ab
This commit is contained in:
Jean Boussier 2024-09-03 10:40:23 +02:00 committed by Hiroshi SHIBATA
parent 57282c62a0
commit 4cd893b048
Notes: git 2024-10-03 05:20:50 +00:00 
Merged: https://github.com/ruby/ruby/pull/11775
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/json/generator/generator.c
View File

@ -814,7 +814,6 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
long delim2_len = FBUFFER_LEN(state->object_delim2); long delim2_len = FBUFFER_LEN(state->object_delim2);
long depth = state->depth; long depth = state->depth;
int j; int j;
VALUE klass, key_to_s;
if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len); if (arg->iter > 0) fbuffer_append(buffer, delim, delim_len);
if (object_nl) { if (object_nl) {
@ -826,15 +825,19 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
} }
} }
klass = CLASS_OF(key); VALUE key_to_s;
if (klass == rb_cString) { switch(rb_type(key)) {
case T_STRING:
key_to_s = key; key_to_s = key;
} else if (klass == rb_cSymbol) { break;
case T_SYMBOL:
key_to_s = rb_sym2str(key); key_to_s = rb_sym2str(key);
} else { break;
key_to_s = rb_funcall(key, i_to_s, 0); default:
key_to_s = rb_convert_type(key, T_STRING, "String", "to_s");
break;
} }
Check_Type(key_to_s, T_STRING);
generate_json(buffer, Vstate, state, key_to_s); generate_json(buffer, Vstate, state, key_to_s);
fbuffer_append(buffer, delim2, delim2_len); fbuffer_append(buffer, delim2, delim2_len);
generate_json(buffer, Vstate, state, val); generate_json(buffer, Vstate, state, val);