diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-15 12:57:14 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-15 16:06:48 +0900 |
commit | 69b3e0ac59f99bbd7e9a76af283f0be1991a3bde (patch) | |
tree | 6745fa66cd5cbcf2b9ad235cf4a6f400957a9ad9 | |
parent | a9567cc2bfad37cc22b3efe0971ba85bd9c1df34 (diff) | |
download | ruby-69b3e0ac59f99bbd7e9a76af283f0be1991a3bde.tar.gz |
Create succ_index_table as a part of `iseq_setup`
With compiling `CPDEBUG >= 2`, `rb_iseq_disasm` segfaults if this
table has not been created. Also `ibf_load_iseq_each` calls
`rb_iseq_insns_info_encode_positions`.
-rw-r--r-- | compile.c | 7 | ||||
-rw-r--r-- | iseq.c | 8 |
2 files changed, 8 insertions, 7 deletions
@@ -1423,6 +1423,13 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) debugs("[compile step 6 (update_catch_except_flags)] \n"); update_catch_except_flags(iseq->body); +#if VM_INSN_INFO_TABLE_IMPL == 2 + if (iseq->body->insns_info.succ_index_table == NULL) { + debugs("[compile step 7 (rb_iseq_insns_info_encode_positions)] \n"); + rb_iseq_insns_info_encode_positions(iseq); + } +#endif + if (compile_debug > 1) { VALUE str = rb_iseq_disasm(iseq); printf("%s\n", StringValueCStr(str)); @@ -615,6 +615,7 @@ void rb_iseq_insns_info_encode_positions(const rb_iseq_t *iseq) { #if VM_INSN_INFO_TABLE_IMPL == 2 + /* create succ_index_table */ struct rb_iseq_constant_body *const body = iseq->body; int size = body->insns_info.size; int max_pos = body->iseq_size; @@ -657,13 +658,6 @@ finish_iseq_build(rb_iseq_t *iseq) ISEQ_COMPILE_DATA_CLEAR(iseq); compile_data_free(data); -#if VM_INSN_INFO_TABLE_IMPL == 2 /* succinct bitvector */ - /* create succ_index_table */ - if (body->insns_info.succ_index_table == NULL) { - rb_iseq_insns_info_encode_positions(iseq); - } -#endif - #if VM_CHECK_MODE > 0 && VM_INSN_INFO_TABLE_IMPL > 0 validate_get_insn_info(iseq); #endif |