mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify enc_autoload_body

Browse Source 
Previously we were looping over the enc_table, but when I added an
assertion the only thing that loop was doing is the equivalent of
ENC_TO_ENCINDEX(base). However we don't even need the index of base.

Instead we should be able to just use the badirectly.
This commit is contained in:
John Hawthorn 2025-09-18 22:02:38 -07:00
parent f048f77c4a
commit 02d5b8443a
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
encoding.c
View File

@ -837,39 +837,28 @@ enc_autoload_body(rb_encoding *enc)
GLOBAL_ENC_TABLE_LOCKING(enc_table) {
base = enc_table->list[ENC_TO_ENCINDEX(enc)].base;
if (base) {
do {
if (i >= enc_table->count) {
i = -1;
break;
}
} while (enc_table->list[i].enc != base && (++i, 1));
}
}
if (i != -1) {
if (base) {
bool do_register = true;
if (rb_enc_autoload_p(base)) {
if (rb_enc_autoload(base) < 0) {
do_register = false;
i = -1;
}
}
if (do_register) {
GLOBAL_ENC_TABLE_LOCKING(enc_table) {
i = ENC_TO_ENCINDEX(enc);
enc_load_from_base(enc_table, i, base);
RUBY_ASSERT(((rb_raw_encoding *)enc)->ruby_encoding_index == i);
}
if (base) {
bool do_register = true;
if (rb_enc_autoload_p(base)) {
if (rb_enc_autoload(base) < 0) {
do_register = false;
i = -1;
}
}
else {
i = -2;
if (do_register) {
GLOBAL_ENC_TABLE_LOCKING(enc_table) {
i = ENC_TO_ENCINDEX(enc);
enc_load_from_base(enc_table, i, base);
RUBY_ASSERT(((rb_raw_encoding *)enc)->ruby_encoding_index == i);
}
}
}
else {
i = -2;
}
return i;
}