From 9d7d6446562e305c085b89b792368301310f3bac Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 11 Dec 2015 15:53:24 +0000 Subject: [PATCH] avoid alignment of static variables affecting stack's Function (or more narrow) scope static variables (as well as others not placed on the stack) should also not have any effect on the stack alignment. I noticed the issue first with Linux'es dynamic_pr_debug() construct using an 8-byte aligned sub-file-scope local variable. According to my checking bad behavior started with 4.6.x (4.5.3 was still okay), but generated code got quite a bit worse as of 4.9.0. gcc/ 2015-12-11 Jan Beulich * cfgexpand.c (expand_one_var): Exit early for static and external variables when adjusting stack alignment related. gcc/testsuite/ 2015-12-11 Jan Beulich * gcc.c-torture/execute/stkalign.c: New. From-SVN: r231569 --- gcc/ChangeLog | 5 ++++ gcc/cfgexpand.c | 3 +++ gcc/testsuite/ChangeLog | 4 +++ .../gcc.c-torture/execute/stkalign.c | 26 +++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/execute/stkalign.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cb9b10ceb41..b52b9aae8d1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-11 Jan Beulich + + * cfgexpand.c (expand_one_var): Exit early for static and + external variables when adjusting stack alignment related. + 2015-12-11 Dominik Vogt * config/s390/s390.c (s390_rtx_costs) diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 7fe02a900bc..7f4eba2c226 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -1550,6 +1550,9 @@ expand_one_var (tree var, bool toplevel, bool really_expand) if (TREE_TYPE (var) != error_mark_node && TREE_CODE (var) == VAR_DECL) { + if (is_global_var (var)) + return 0; + /* Because we don't know if VAR will be in register or on stack, we conservatively assume it will be on stack even if VAR is eventually put into register after RA pass. For non-automatic diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 541228af5a1..1372d841305 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-12-11 Jan Beulich + + * gcc.c-torture/execute/stkalign.c: New. + 2015-12-11 Tsvetkova Alexandra * gcc.target/i386/mpx/memmove-1.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/execute/stkalign.c b/gcc/testsuite/gcc.c-torture/execute/stkalign.c new file mode 100644 index 00000000000..e8761b936aa --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/stkalign.c @@ -0,0 +1,26 @@ +/* { dg-options "-fno-inline" } */ + +#include + +#define ALIGNMENT 64 + +unsigned test(unsigned n, unsigned p) +{ + static struct { char __attribute__((__aligned__(ALIGNMENT))) c; } s; + unsigned x; + + assert(__alignof__(s) == ALIGNMENT); + asm ("" : "=g" (x), "+m" (s) : "0" (&x)); + + return n ? test(n - 1, x) : (x ^ p); +} + +int main (int argc, char *argv[] __attribute__((unused))) +{ + unsigned int x = test(argc, 0); + + x |= test(argc + 1, 0); + x |= test(argc + 2, 0); + + return !(x & (ALIGNMENT - 1)); +} -- 2.30.2