From 9556b012b73024a95e72d8aa1b434ad50b8df9d3 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 17 Jan 2019 09:04:28 +0100 Subject: [PATCH] re PR rtl-optimization/88870 (ICE: Segmentation fault (in df_worklist_propagate_backward)) PR rtl-optimization/88870 * dce.c (deletable_insn_p): Never delete const/pure calls that can throw if we can't alter the cfg or delete dead exceptions. (mark_insn): Don't call find_call_stack_args for such calls. * gcc.dg/pr88870.c: New test. From-SVN: r268008 --- gcc/ChangeLog | 7 +++++++ gcc/dce.c | 9 +++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr88870.c | 23 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr88870.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6b17531b551..986a73d0118 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-01-17 Jakub Jelinek + + PR rtl-optimization/88870 + * dce.c (deletable_insn_p): Never delete const/pure calls that can + throw if we can't alter the cfg or delete dead exceptions. + (mark_insn): Don't call find_call_stack_args for such calls. + 2019-01-17 Kewen Lin * doc/extend.texi: Add four new prototypes for vec_ld and seven new diff --git a/gcc/dce.c b/gcc/dce.c index ae8c478a002..7fd9c37aa44 100644 --- a/gcc/dce.c +++ b/gcc/dce.c @@ -108,7 +108,10 @@ deletable_insn_p (rtx_insn *insn, bool fast, bitmap arg_stores) /* We can delete dead const or pure calls as long as they do not infinite loop. */ && (RTL_CONST_OR_PURE_CALL_P (insn) - && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn))) + && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn)) + /* Don't delete calls that may throw if we cannot do so. */ + && ((cfun->can_delete_dead_exceptions && can_alter_cfg) + || insn_nothrow_p (insn))) return find_call_stack_args (as_a (insn), false, fast, arg_stores); @@ -201,7 +204,9 @@ mark_insn (rtx_insn *insn, bool fast) && !df_in_progress && !SIBLING_CALL_P (insn) && (RTL_CONST_OR_PURE_CALL_P (insn) - && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn))) + && !RTL_LOOPING_CONST_OR_PURE_CALL_P (insn)) + && ((cfun->can_delete_dead_exceptions && can_alter_cfg) + || insn_nothrow_p (insn))) find_call_stack_args (as_a (insn), true, fast, NULL); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4f85b1a10ef..3548e4f7eea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-17 Jakub Jelinek + + PR rtl-optimization/88870 + * gcc.dg/pr88870.c: New test. + 2019-01-17 Kewen Lin * gcc.target/powerpc/altivec_vld_vst_addr.c: New test. diff --git a/gcc/testsuite/gcc.dg/pr88870.c b/gcc/testsuite/gcc.dg/pr88870.c new file mode 100644 index 00000000000..3f46f32f3ee --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr88870.c @@ -0,0 +1,23 @@ +/* PR rtl-optimization/88870 */ +/* { dg-do compile } */ +/* { dg-options "-O1 -fexceptions -fnon-call-exceptions -ftrapv -fno-tree-dominator-opts" } */ + +int a, b; + +void +foo (int *x) +{ + int c = 0; + { + int d; + x = &c; + for (;;) + { + x = &d; + b = 0; + d = c + 1; + b = c = 1; + ++a; + } + } +} -- 2.30.2