diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-03-31 15:00:52 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-03-31 15:00:52 +0200 |
| commit | 97eb24c42a5d82617e576165867dd6678b6b1262 (patch) | |
| tree | 636c21bb81e44f2fcc4017f5e4228179bea95408 | |
| parent | d4aff57bc079dc04d7d3ab9f71b2e923d9087e31 (diff) | |
| download | gcc-97eb24c42a5d82617e576165867dd6678b6b1262.zip gcc-97eb24c42a5d82617e576165867dd6678b6b1262.tar.gz gcc-97eb24c42a5d82617e576165867dd6678b6b1262.tar.bz2 | |
re PR rtl-optimization/70460 (Miscompilation of glibc on i686-linux starting with r234101)
PR rtl-optimization/70460
* ira.c (indirect_jump_optimize): Don't substitute LABEL_REF
with operand from REG_LABEL_OPERAND, instead substitute
SET_SRC or REG_EQUAL note content if it is a LABEL_REF.
Don't do anything for REG_NON_LOCAL_GOTO jumps.
* gcc.c-torture/execute/pr70460.c: New test.
From-SVN: r234614
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ira.c | 24 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/pr70460.c | 29 |
4 files changed, 54 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9edee6b1..64c8fcd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-03-31 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/70460 + * ira.c (indirect_jump_optimize): Don't substitute LABEL_REF + with operand from REG_LABEL_OPERAND, instead substitute + SET_SRC or REG_EQUAL note content if it is a LABEL_REF. + Don't do anything for REG_NON_LOCAL_GOTO jumps. + 2016-03-31 Martin Liska <mliska@suse.cz> * passes.c (execute_one_pass): Do not call @@ -3870,7 +3870,8 @@ indirect_jump_optimize (void) FOR_EACH_BB_REVERSE_FN (bb, cfun) { rtx_insn *insn = BB_END (bb); - if (!JUMP_P (insn)) + if (!JUMP_P (insn) + || find_reg_note (insn, REG_NON_LOCAL_GOTO, NULL_RTX)) continue; rtx x = pc_set (insn); @@ -3884,19 +3885,18 @@ indirect_jump_optimize (void) if (!DF_REF_IS_ARTIFICIAL (def)) { rtx_insn *def_insn = DF_REF_INSN (def); - rtx note = find_reg_note (def_insn, REG_LABEL_OPERAND, NULL_RTX); - - if (note) + rtx lab = NULL_RTX; + rtx set = single_set (def_insn); + if (set && GET_CODE (SET_SRC (set)) == LABEL_REF) + lab = SET_SRC (set); + else { - /* Substitute a LABEL_REF to the label given by the - note rather than using SET_SRC of DEF_INSN. - DEF_INSN might be loading the label constant from - a constant pool, which isn't what we want in a - direct branch. */ - rtx lab = gen_rtx_LABEL_REF (Pmode, XEXP (note, 0)); - if (validate_replace_rtx (SET_SRC (x), lab, insn)) - rebuild_p = true; + rtx eqnote = find_reg_note (def_insn, REG_EQUAL, NULL_RTX); + if (eqnote && GET_CODE (XEXP (eqnote, 0)) == LABEL_REF) + lab = XEXP (eqnote, 0); } + if (lab && validate_replace_rtx (SET_SRC (x), lab, insn)) + rebuild_p = true; } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7df13570..aa0e17e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-03-31 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/70460 + * gcc.c-torture/execute/pr70460.c: New test. + 2016-03-31 Richard Biener <rguenther@suse.de> PR c++/70430 diff --git a/gcc/testsuite/gcc.c-torture/execute/pr70460.c b/gcc/testsuite/gcc.c-torture/execute/pr70460.c new file mode 100644 index 0000000..bfecea0 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr70460.c @@ -0,0 +1,29 @@ +/* PR rtl-optimization/70460 */ + +int c; + +__attribute__((noinline, noclone)) void +foo (int x) +{ + static int b[] = { &&lab1 - &&lab0, &&lab2 - &&lab0 }; + void *a = &&lab0 + b[x]; + goto *a; +lab1: + c += 2; +lab2: + c++; +lab0: + ; +} + +int +main () +{ + foo (0); + if (c != 3) + __builtin_abort (); + foo (1); + if (c != 4) + __builtin_abort (); + return 0; +} |