From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 30 Jan 2014 21:48:08 +0000 (+0000)
Subject: 	PR target/59923
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97e155b14a54234bd4d9a872bfcdb513a78e3832;p=thirdparty%2Fgcc.git

	PR target/59923
	* ifcvt.c (cond_exec_process_insns): Don't conditionalize
	frame related instructions.

	* gcc.target/arm/pr59923.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207324 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eae504134aaf..d78cf54375d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/59923
+	* ifcvt.c (cond_exec_process_insns): Don't conditionalize
+	frame related instructions.
+
 2014-01-30  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/59959
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 51293651e9cc..e4b3e8dade95 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -338,6 +338,10 @@ cond_exec_process_insns (ce_if_block *ce_info ATTRIBUTE_UNUSED,
 
       gcc_assert (NONJUMP_INSN_P (insn) || CALL_P (insn));
 
+      /* dwarf2out can't coope with conditional unwind info.  */
+      if (RTX_FRAME_RELATED_P (insn))
+	return FALSE;
+
       /* Remove USE insns that get in the way.  */
       if (reload_completed && GET_CODE (PATTERN (insn)) == USE)
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d8d8c076bda3..597029adf36e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/59923
+	* gcc.target/arm/pr59923.c: New test.
+
 2014-01-30  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* gcc.dg/vmx/splat.c: New.
diff --git a/gcc/testsuite/gcc.target/arm/pr59923.c b/gcc/testsuite/gcc.target/arm/pr59923.c
new file mode 100644
index 000000000000..86a4e7d8350b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/pr59923.c
@@ -0,0 +1,24 @@
+/* PR target/59923 */
+/* { dg-do compile } */
+/* { dg-require-effective-target arm_thumb2_ok } */
+/* { dg-options "-O2 -mcpu=cortex-a15 -fno-strict-aliasing -mthumb -g" } */
+
+struct S
+{
+  void *s;
+  struct T { unsigned short a; unsigned char b[4], c[4]; } *t;
+} s;
+void bar (void *);
+
+void
+foo (struct S *x, int *y)
+{
+  if (*y > 0)
+    return;
+  else if (x->t->b[0] == 0x43 && x->t->b[1] == 0x6d && x->t->c[0] == 1)
+    x->s = &s;
+  else
+    *y = 16384;
+  if (*y > 0)
+    bar (x);
+}