From 3ed8374491a502e749a738d72d000fe36e95bae0 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 29 Aug 2016 07:57:16 +0000 Subject: [PATCH] backport: re PR sanitizer/64078 (FAIL: c-c++-common/ubsan/object-size-9.c) 2016-08-29 Tom de Vries backport from trunk: 2015-09-17 Bernd Edlinger PR sanitizer/64078 * c-c++-common/ubsan/object-size-9.c (s): Add alignment attribute. (f2, f3): Make the function static. * c-c++-common/ubsan/object-size-10.c (a, b): Add alignment attribute. From-SVN: r239816 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/c-c++-common/ubsan/object-size-10.c | 4 ++-- gcc/testsuite/c-c++-common/ubsan/object-size-9.c | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0c9ed6337fe..82551ef68f2f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2016-08-29 Tom de Vries + + backport from trunk: + 2015-09-17 Bernd Edlinger + + PR sanitizer/64078 + * c-c++-common/ubsan/object-size-9.c (s): Add alignment attribute. + (f2, f3): Make the function static. + * c-c++-common/ubsan/object-size-10.c (a, b): Add alignment attribute. + 2016-08-29 Tom de Vries backport from trunk: diff --git a/gcc/testsuite/c-c++-common/ubsan/object-size-10.c b/gcc/testsuite/c-c++-common/ubsan/object-size-10.c index ebc8582ec3cf..8aa00bfc14e6 100644 --- a/gcc/testsuite/c-c++-common/ubsan/object-size-10.c +++ b/gcc/testsuite/c-c++-common/ubsan/object-size-10.c @@ -2,8 +2,8 @@ /* { dg-skip-if "" { *-*-* } { "*" } { "-O2" } } */ /* { dg-options "-fsanitize=undefined" } */ -static char a[128]; -static int b[128]; +static char a[128] __attribute__ ((aligned(4096))); +static int b[128] __attribute__ ((aligned(4096))); __attribute__ ((noinline, noclone)) int fn1 (int i) diff --git a/gcc/testsuite/c-c++-common/ubsan/object-size-9.c b/gcc/testsuite/c-c++-common/ubsan/object-size-9.c index 829c82295922..e718020d08ea 100644 --- a/gcc/testsuite/c-c++-common/ubsan/object-size-9.c +++ b/gcc/testsuite/c-c++-common/ubsan/object-size-9.c @@ -11,7 +11,7 @@ struct C { C () : d("abcdefg"), e(1) {} C (const C &x) { __builtin_memcpy (d, x. #endif struct U { int a : 5; int b : 19; int c : 8; }; struct S { struct U d[10]; }; -struct S s; +struct S s __attribute__ ((aligned(4096))); int f1 (struct T x, int i) @@ -27,7 +27,7 @@ f1 (struct T x, int i) /* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */ #ifdef __cplusplus -struct C +static struct C f2 (int i) { struct C x; @@ -41,7 +41,7 @@ f2 (int i) /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */ /* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */ -struct C +static struct C f3 (int i) { struct C x; -- 2.47.2