From 89cfdb7e5ba6f5e00e13473790ef787189c59c01 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 8 Feb 2019 11:26:33 +0100 Subject: [PATCH] re PR rtl-optimization/89234 (ICE in get_eh_region_and_lp_from_rtx at gcc/except.c:1824) PR rtl-optimization/89234 * except.c (copy_reg_eh_region_note_forward): Return if note_or_insn is a NOTE, CODE_LABEL etc. - rtx_insn * other than INSN_P. (copy_reg_eh_region_note_backward): Likewise. * g++.dg/ubsan/pr89234.C: New test. From-SVN: r268669 --- gcc/ChangeLog | 7 +++++++ gcc/except.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/ubsan/pr89234.C | 11 +++++++++++ 4 files changed, 27 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ubsan/pr89234.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e78ab65002..14c618340b4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-02-08 Jakub Jelinek + + PR rtl-optimization/89234 + * except.c (copy_reg_eh_region_note_forward): Return if note_or_insn + is a NOTE, CODE_LABEL etc. - rtx_insn * other than INSN_P. + (copy_reg_eh_region_note_backward): Likewise. + 2019-02-08 Richard Biener PR middle-end/89223 diff --git a/gcc/except.c b/gcc/except.c index 10fef2f3544..29437f38524 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -1756,6 +1756,8 @@ copy_reg_eh_region_note_forward (rtx note_or_insn, rtx_insn *first, rtx last) if (note == NULL) return; } + else if (is_a (note_or_insn)) + return; note = XEXP (note, 0); for (insn = first; insn != last ; insn = NEXT_INSN (insn)) @@ -1778,6 +1780,8 @@ copy_reg_eh_region_note_backward (rtx note_or_insn, rtx_insn *last, rtx first) if (note == NULL) return; } + else if (is_a (note_or_insn)) + return; note = XEXP (note, 0); for (insn = last; insn != first; insn = PREV_INSN (insn)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9f4296b0438..fd3fbf1df45 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-02-08 Jakub Jelinek + + PR rtl-optimization/89234 + * g++.dg/ubsan/pr89234.C: New test. + 2019-02-08 Richard Biener PR middle-end/89223 diff --git a/gcc/testsuite/g++.dg/ubsan/pr89234.C b/gcc/testsuite/g++.dg/ubsan/pr89234.C new file mode 100644 index 00000000000..af1526c0391 --- /dev/null +++ b/gcc/testsuite/g++.dg/ubsan/pr89234.C @@ -0,0 +1,11 @@ +// PR rtl-optimization/89234 +// { dg-do compile { target dfp } } +// { dg-options "-O2 -fnon-call-exceptions -fsanitize=null" } + +typedef float __attribute__((mode (SD))) _Decimal32; + +void +foo (_Decimal32 *b, _Decimal32 c) +{ + *b = c + 1.5; +} -- 2.30.2