From: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Date: Wed, 8 Jul 2015 10:59:32 +0000 (+0000)
Subject: S/390: Remove assertion in s390_init_frame_layout.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9158295f82ca314206f02377f59ca1e21bb98020;p=gcc.git

S/390: Remove assertion in s390_init_frame_layout.

gcc/ChangeLog:

2015-07-08  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	    * config/s390/s390.c (s390_init_frame_layout): Replace assertion
	    with early exit.

From-SVN: r225542
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa6df55e5ca..a4c4b7686c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-08  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+	* config/s390/s390.c (s390_init_frame_layout): Replace assertion
+	with early exit.
+
 2015-07-08  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*jcc_bt<mode>): Only allow const_int values
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index e9e9bc96835..3982afeaa87 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -9343,7 +9343,10 @@ s390_init_frame_layout (void)
   HOST_WIDE_INT frame_size;
   int base_used;
 
-  gcc_assert (!reload_completed);
+  /* After LRA the frame layout is supposed to be read-only and should
+     not be re-computed.  */
+  if (reload_completed)
+    return;
 
   /* On S/390 machines, we may need to perform branch splitting, which
      will require both base and return address register.  We have no