From: krebbel <krebbel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 27 Aug 2015 07:38:36 +0000 (+0000)
Subject: S/390: Add emit_barrier() after trap
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482869e7846840f6603d783b2440c44d29fc4d68;p=thirdparty%2Fgcc.git

S/390: Add emit_barrier() after trap

gcc/ChangeLog

	* config/s390/s390.c (s390_emit_prologue): Add emit_barrier() after
	trap to fix ICE.

gcc/testsuite/ChangeLog

	* gcc.target/s390/20150826-1.c: New test.



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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1cfd8e8e7140..e8884c00ceee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-27  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* config/s390/s390.c (s390_emit_prologue): Add emit_barrier() after
+	trap to fix ICE.
+
 2015-08-26  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	* config/rs6000/rs6000-protos.h (rs6000_expand_float128_convert):
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 54b6b7d5859f..cbfc80073c9f 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -10351,6 +10351,7 @@ s390_emit_prologue (void)
 		       current_function_name(), cfun_frame_layout.frame_size,
 		       s390_stack_size);
 	      emit_insn (gen_trap ());
+	      emit_barrier ();
 	    }
 	  else
 	    {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 27be013c3d9f..15a2a438b997 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-27  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* gcc.target/s390/20150826-1.c: New test.
+
 2015-08-26  Renlin Li  <renlin.li@arm.com>
 
 	* gcc.target/aarch64/combine_bfi_1.c: New testcase.
diff --git a/gcc/testsuite/gcc.target/s390/20150826-1.c b/gcc/testsuite/gcc.target/s390/20150826-1.c
new file mode 100644
index 000000000000..1567ced42e1d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/20150826-1.c
@@ -0,0 +1,12 @@
+/* Check that emitting a dynamic stack check for sizes below the
+   current frame size work.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O3 -mstack-size=32" } */
+
+extern int bar(char *);
+int foo(void)
+{
+  char b[100];
+  return bar(b);
+} /* { dg-warning "An unconditional trap is added" } */