diff options
| author | Vladimir Makarov <vmakarov@redhat.com> | 2017-10-16 20:34:53 +0000 |
|---|---|---|
| committer | Vladimir Makarov <vmakarov@gcc.gnu.org> | 2017-10-16 20:34:53 +0000 |
| commit | 2de3d3c6a62ac4299e9f5a310e4bf8ff28dbd47f (patch) | |
| tree | d2982e904ae5477184e730c0645f8001df5fdce5 | |
| parent | 55015c109a09c6f5f1fa76bef388628ee895eedb (diff) | |
| download | gcc-2de3d3c6a62ac4299e9f5a310e4bf8ff28dbd47f.zip gcc-2de3d3c6a62ac4299e9f5a310e4bf8ff28dbd47f.tar.gz gcc-2de3d3c6a62ac4299e9f5a310e4bf8ff28dbd47f.tar.bz2 | |
re PR sanitizer/82353 (runtime ubsan crash)
2017-10-16 Vladimir Makarov <vmakarov@redhat.com>
PR sanitizer/82353
* lra.c (collect_non_operand_hard_regs): Don't ignore operator
locations.
* lra-lives.c (bb_killed_pseudos, bb_gen_pseudos): Move up.
(make_hard_regno_born, make_hard_regno_dead): Update
bb_killed_pseudos and bb_gen_pseudos for fixed regs.
From-SVN: r253796
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/lra-lives.c | 13 | ||||
| -rw-r--r-- | gcc/lra.c | 3 |
3 files changed, 21 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df26aeb..1814910 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-10-16 Vladimir Makarov <vmakarov@redhat.com> + + PR sanitizer/82353 + * lra.c (collect_non_operand_hard_regs): Don't ignore operator + locations. + * lra-lives.c (bb_killed_pseudos, bb_gen_pseudos): Move up. + (make_hard_regno_born, make_hard_regno_dead): Update + bb_killed_pseudos and bb_gen_pseudos for fixed regs. + 2017-10-16 Jeff Law <law@redhat.com> * tree-ssa-dse.c (live_bytes_read): Fix thinko. diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c index 4648eca..df7e253 100644 --- a/gcc/lra-lives.c +++ b/gcc/lra-lives.c @@ -220,6 +220,9 @@ lra_intersected_live_ranges_p (lra_live_range_t r1, lra_live_range_t r2) return false; } +/* The corresponding bitmaps of BB currently being processed. */ +static bitmap bb_killed_pseudos, bb_gen_pseudos; + /* The function processing birth of hard register REGNO. It updates living hard regs, START_LIVING, and conflict hard regs for living pseudos. Conflict hard regs for the pic pseudo is not updated if @@ -243,6 +246,8 @@ make_hard_regno_born (int regno, bool check_pic_pseudo_p ATTRIBUTE_UNUSED) || i != REGNO (pic_offset_table_rtx)) #endif SET_HARD_REG_BIT (lra_reg_info[i].conflict_hard_regs, regno); + if (fixed_regs[regno]) + bitmap_set_bit (bb_gen_pseudos, regno); } /* Process the death of hard register REGNO. This updates @@ -255,6 +260,11 @@ make_hard_regno_dead (int regno) return; sparseset_set_bit (start_dying, regno); CLEAR_HARD_REG_BIT (hard_regs_live, regno); + if (fixed_regs[regno]) + { + bitmap_clear_bit (bb_gen_pseudos, regno); + bitmap_set_bit (bb_killed_pseudos, regno); + } } /* Mark pseudo REGNO as living at program point POINT, update conflicting @@ -299,9 +309,6 @@ mark_pseudo_dead (int regno, int point) } } -/* The corresponding bitmaps of BB currently being processed. */ -static bitmap bb_killed_pseudos, bb_gen_pseudos; - /* Mark register REGNO (pseudo or hard register) in MODE as live at program point POINT. Update BB_GEN_PSEUDOS. Return TRUE if the liveness tracking sets were modified, or FALSE @@ -820,7 +820,8 @@ collect_non_operand_hard_regs (rtx *x, lra_insn_recog_data_t data, const char *fmt = GET_RTX_FORMAT (code); for (i = 0; i < data->insn_static_data->n_operands; i++) - if (x == data->operand_loc[i]) + if (! data->insn_static_data->operand[i].is_operator + && x == data->operand_loc[i]) /* It is an operand loc. Stop here. */ return list; for (i = 0; i < data->insn_static_data->n_dups; i++) |