aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2015-07-08 10:59:32 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2015-07-08 10:59:32 +0000
commit9158295f82ca314206f02377f59ca1e21bb98020 (patch)
treedc86b69c50b64c503d683e8904d8d67800d5e9cb /gcc
parent7b3bc1f3bdc39883d1d3575341b280a762731a5b (diff)
downloadgcc-9158295f82ca314206f02377f59ca1e21bb98020.zip
gcc-9158295f82ca314206f02377f59ca1e21bb98020.tar.gz
gcc-9158295f82ca314206f02377f59ca1e21bb98020.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/s390/s390.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa6df55..a4c4b76 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 e9e9bc9..3982afe 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