diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2022-06-13 12:14:03 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2022-06-13 15:22:32 +0900 |
| commit | b2e58b02aec73f9c350bf109c021c180fc699ccc (patch) | |
| tree | 3b62454a8e4bddc88b834e76702dc74f082f09ae | |
| parent | 5060c9d852be4b99d773ec1d94e0ec08ac4299b7 (diff) | |
compile.c (add_adjust_info): Remove `insns_info_index > 0`
... because insns_info_index could not be zero here. Also it adds an
invariant check for that.
This change will prevent the following warning of GCC 12.1
http://rubyci.s3.amazonaws.com/arch/ruby-master/log/20220613T000004Z.log.html.gz
```
compile.c:2230:39: warning: array subscript 2147483647 is outside array bounds of ‘struct iseq_insn_info_entry[2147483647]’ [-Warray-bounds]
2230 | insns_info[insns_info_index-1].line_no != adjust->line_no) {
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
```
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6008
| -rw-r--r-- | compile.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -2226,8 +2226,7 @@ static int add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions, int insns_info_index, int code_index, const ADJUST *adjust) { - if (insns_info_index > 0 || - insns_info[insns_info_index-1].line_no != adjust->line_no) { + if (insns_info[insns_info_index-1].line_no != adjust->line_no) { insns_info[insns_info_index].line_no = adjust->line_no; insns_info[insns_info_index].events = 0; positions[insns_info_index] = code_index; @@ -2474,6 +2473,10 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor) if (adjust->line_no != -1) { const int diff = orig_sp - sp; if (diff > 0) { + if (insns_info_index == 0) { + COMPILE_ERROR(iseq, adjust->line_no, + "iseq_set_sequence: adjust bug (ISEQ_ELEMENT_ADJUST must not be the first in iseq)"); + } if (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++; } if (diff > 1) { |