Skip to content

Commit

Permalink
compile.c (add_adjust_info): Remove insns_info_index > 0
Browse files Browse the repository at this point in the history
... 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) {
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
```
  • Loading branch information
mame committed Jun 13, 2022
1 parent 5060c9d commit b2e58b0
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions compile.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit b2e58b0

Please sign in to comment.