aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2016-11-07 12:26:48 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2016-11-07 12:26:48 +0000
commite8ab5cb19b6d93ed4dd1eaf6dbea66da41256926 (patch)
tree6bff2ddf71308949163ce28e2787beb768b8589a
parent20770eb80bf59f4fe1d71408b841669c70550e6c (diff)
downloadgcc-e8ab5cb19b6d93ed4dd1eaf6dbea66da41256926.zip
gcc-e8ab5cb19b6d93ed4dd1eaf6dbea66da41256926.tar.gz
gcc-e8ab5cb19b6d93ed4dd1eaf6dbea66da41256926.tar.bz2
re PR target/78229 (ICE in redirect_eh_edge_1, at tree-eh.c:2305)
2016-11-07 Richard Biener <rguenther@suse.de> PR target/78229 * config/i386/i386.c (ix86_gimple_fold_builtin): Do not adjust EH info. * g++.dg/pr78229.C: New testcase. From-SVN: r241901
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/i386.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/pr78229.C24
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ccd3b4..9714a07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2016-11-07 Richard Biener <rguenther@suse.de>
+ PR target/78229
+ * config/i386/i386.c (ix86_gimple_fold_builtin): Do not adjust
+ EH info.
+
+2016-11-07 Richard Biener <rguenther@suse.de>
+
PR tree-optimization/78218
* gimple-ssa-store-merging.c
(pass_store_merging::terminate_all_aliasing_chains):
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index bffba80..a78cf78 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -33518,7 +33518,7 @@ ix86_gimple_fold_builtin (gimple_stmt_iterator *gsi)
gsi_insert_before (gsi, g, GSI_SAME_STMT);
g = gimple_build_assign (gimple_call_lhs (stmt), NOP_EXPR, lhs);
gimple_set_location (g, loc);
- gsi_replace (gsi, g, true);
+ gsi_replace (gsi, g, false);
return true;
}
break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 242b51b..06798a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2016-11-07 Richard Biener <rguenther@suse.de>
+ PR target/78229
+ * g++.dg/pr78229.C: New testcase.
+
+2016-11-07 Richard Biener <rguenther@suse.de>
+
PR tree-optimization/78218
* gcc.dg/torture/pr78218.c: New testcase.
diff --git a/gcc/testsuite/g++.dg/pr78229.C b/gcc/testsuite/g++.dg/pr78229.C
new file mode 100644
index 0000000..a52141b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr78229.C
@@ -0,0 +1,24 @@
+/* { dg-do compile { target x86_64-*-* i?86-*-* } } */
+/* { dg-options "-O2 -mbmi -w" } */
+
+void a();
+inline int b(int c) {
+ int d = c;
+ return __builtin_ia32_tzcnt_u32(d);
+}
+struct e {};
+int f, g, h;
+void fn3() {
+ float j;
+ &j;
+ {
+ e k;
+ while (h) {
+ if (g == 0)
+ continue;
+ int i = b(g);
+ f = i;
+ }
+ a();
+ }
+}