1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c (add_adjust_info): Remove insns_info_index > 0

Browse Source 
... 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) {
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
```
This commit is contained in:
Yusuke Endoh 2022-06-13 12:14:03 +09:00
parent 5060c9d852
commit b2e58b02ae
Notes: git 2022-06-13 15:22:52 +09:00 
Merged: https://github.com/ruby/ruby/pull/6008
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compile.c
View File

@ -2226,8 +2226,7 @@ static int
add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions, add_adjust_info(struct iseq_insn_info_entry *insns_info, unsigned int *positions,
int insns_info_index, int code_index, const ADJUST *adjust) int insns_info_index, int code_index, const ADJUST *adjust)
{ {
if (insns_info_index > 0 || if (insns_info[insns_info_index-1].line_no != adjust->line_no) {
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].line_no = adjust->line_no;
insns_info[insns_info_index].events = 0; insns_info[insns_info_index].events = 0;
positions[insns_info_index] = code_index; 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) { if (adjust->line_no != -1) {
const int diff = orig_sp - sp; const int diff = orig_sp - sp;
if (diff > 0) { 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 (add_adjust_info(insns_info, positions, insns_info_index, code_index, adjust)) insns_info_index++;
} }
if (diff > 1) { if (diff > 1) {