Skip to content

[generator.c] Mark ensure_valid_encoding as ALWAYS_INLINE. #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
byroot merged 1 commit into from
Apr 20, 2026
+11 −5
Merged

[generator.c] Mark ensure_valid_encoding as ALWAYS_INLINE. #975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ext/json/ext/generator/generator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,12 +842,8 @@ static inline bool valid_json_string_p(VALUE str)
return false;
}

static inline VALUE ensure_valid_encoding(struct generate_json_data *data, VALUE str, bool as_json_called, bool is_key)
NOINLINE(static) VALUE convert_invalid_encoding(struct generate_json_data *data, VALUE str, bool as_json_called, bool is_key)
{
if (RB_LIKELY(valid_json_string_p(str))) {
return str;
}

if (!as_json_called && data->state->strict && RTEST(data->state->as_json)) {
VALUE coerced_str = json_call_as_json(data->state, str, Qfalse);
if (coerced_str != str) {
Expand Down Expand Up @@ -883,6 +879,16 @@ static inline VALUE ensure_valid_encoding(struct generate_json_data *data, VALUE
return rb_rescue(encode_json_string_try, str, encode_json_string_rescue, str);
}

ALWAYS_INLINE(static) VALUE ensure_valid_encoding(struct generate_json_data *data, VALUE str, bool as_json_called, bool is_key)
{
if (RB_LIKELY(valid_json_string_p(str))) {
return str;
}
else {
return convert_invalid_encoding(data, str, as_json_called, is_key);
}
}

static void raw_generate_json_string(FBuffer *buffer, struct generate_json_data *data, VALUE obj)
{
fbuffer_append_char(buffer, '"');
Expand Down