[PATCH] stor-layout: Reject forming arrays with elt sizes not divisible by elt alignment [PR97164]

Jakub Jelinek jakub@redhat.com
Fri Sep 25 09:01:28 GMT 2020


Hi!

As mentioned in the PR, since 2005 we reject if array elements are smaller
than their alignment (i.e. overaligned elements), because such arrays don't
make much sense, only their first element is guaranteed to be aligned as
user requested, but the next element can't be.
The following testcases show something we've been silent about but is
equally bad, the 2005 case is just the most common special case of that
the array element size is not divisible by the alignment.  In those arrays
too only the first element is guaranteed to be properly aligned and the
second one can't be.

This patch rejects those cases too, but keeps the existing wording for the
old common case.

Unfortunately, the patch breaks bootstrap, because libbid uses this mess
(forms arrays with 24 byte long elements with 16 byte element alignment).
I don't really see justification for that, so I've decreased the alignment
to 8 bytes instead.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

2020-09-25  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/97164
gcc/
	* stor-layout.c (layout_type): Also reject arrays where element size
	is constant, but not a multiple of element alignment.
gcc/testsuite/
	* c-c++-common/pr97164.c: New test.
	* gcc.c-torture/execute/pr36093.c: Move ...
	* gcc.dg/pr36093.c: ... here.  Add dg-do compile and dg-error
	directives.
	* gcc.c-torture/execute/pr43783.c: Move ...
	* gcc.dg/pr43783.c: ... here.  Add dg-do compile, dg-options and
	dg-error directives.
libgcc/
	* config/libbid/bid_functions.h (UINT192): Decrease alignment to 8
	bytes.

--- gcc/stor-layout.c.jj	2020-04-21 17:06:17.267661631 +0200
+++ gcc/stor-layout.c	2020-09-22 20:51:39.311285386 +0200
@@ -2579,10 +2579,19 @@ layout_type (tree type)
 	    /* If TYPE_SIZE_UNIT overflowed, then it is certainly larger than
 	       TYPE_ALIGN_UNIT.  */
 	    && !TREE_OVERFLOW (TYPE_SIZE_UNIT (element))
-	    && !integer_zerop (TYPE_SIZE_UNIT (element))
-	    && compare_tree_int (TYPE_SIZE_UNIT (element),
-			  	 TYPE_ALIGN_UNIT (element)) < 0)
-	  error ("alignment of array elements is greater than element size");
+	    && !integer_zerop (TYPE_SIZE_UNIT (element)))
+	  {
+	    if (compare_tree_int (TYPE_SIZE_UNIT (element),
+				  TYPE_ALIGN_UNIT (element)) < 0)
+	      error ("alignment of array elements is greater than "
+		     "element size");
+	    else if (TYPE_ALIGN_UNIT (element) > 1
+		     && (wi::zext (wi::to_wide (TYPE_SIZE_UNIT (element)),
+				  ffs_hwi (TYPE_ALIGN_UNIT (element)) - 1)
+			 != 0))
+	      error ("size of array element is not a multiple of its "
+		     "alignment");
+	  }
 	break;
       }
 
--- libgcc/config/libbid/bid_functions.h.jj	2020-01-14 20:02:48.619582332 +0100
+++ libgcc/config/libbid/bid_functions.h	2020-09-23 01:12:02.672546190 +0200
@@ -81,7 +81,7 @@ ALIGN (16)
 #define SQRT80 sqrtw
 #endif
 
-     typedef ALIGN (16)
+     typedef ALIGN (8)
      struct {
        UINT64 w[3];
      } UINT192;
--- gcc/testsuite/c-c++-common/pr97164.c.jj	2020-09-22 20:54:41.846670263 +0200
+++ gcc/testsuite/c-c++-common/pr97164.c	2020-09-22 20:54:21.815957235 +0200
@@ -0,0 +1,15 @@
+/* PR tree-optimization/97164 */
+/* { dg-do compile } */
+
+typedef struct { int *a; char b[64]; } A __attribute__((aligned (64)));
+struct B { A d[4]; } b;	/* { dg-error "size of array element is not a multiple of its alignment" } */
+void foo (void);
+
+int *
+bar (void)
+{
+  struct B *h = &b;
+  if (h->d[1].a)
+    foo ();
+  return h->d[1].a;
+}
--- gcc/testsuite/gcc.c-torture/execute/pr36093.c.jj	2020-01-12 11:54:37.353399227 +0100
+++ gcc/testsuite/gcc.c-torture/execute/pr36093.c	2020-09-24 17:40:20.804678958 +0200
@@ -1,30 +0,0 @@
-/* { dg-skip-if "small alignment" { pdp11-*-* } } */
-
-extern void abort (void);
-
-typedef struct Bar {
-      char c[129];
-} Bar __attribute__((__aligned__(128)));
-
-typedef struct Foo {
-      Bar bar[4];
-} Foo;
-
-Foo foo[4];
-
-int main()
-{
-   int i, j;
-   Foo *foop = &foo[0];
-
-   for (i=0; i < 4; i++) {
-      Bar *bar = &foop->bar[i];
-      for (j=0; j < 129; j++) {
-         bar->c[j] = 'a' + i;
-      }
-   }
-
-   if (foo[0].bar[3].c[128] != 'd')
-     abort ();
-   return 0;
-}
--- gcc/testsuite/gcc.c-torture/execute/pr43783.c.jj	2020-01-12 11:54:37.354399212 +0100
+++ gcc/testsuite/gcc.c-torture/execute/pr43783.c	2020-09-24 17:45:11.039563874 +0200
@@ -1,23 +0,0 @@
-/* { dg-skip-if "small alignment" { pdp11-*-* } } */
-
-typedef __attribute__((aligned(16)))
-struct {
-  unsigned long long w[3];
-} UINT192;
-
-UINT192 bid_Kx192[32];
-
-extern void abort (void);
-
-int main()
-{
-  int i = 0;
-  unsigned long x = 0;
-  for (i = 0; i < 32; ++i)
-    bid_Kx192[i].w[1] = i == 1;
-  for (i = 0; i < 32; ++i)
-    x += bid_Kx192[1].w[1];
-  if (x != 32)
-    abort ();
-  return 0;
-}
--- gcc/testsuite/gcc.dg/pr36093.c.jj	2020-09-24 17:40:19.121702819 +0200
+++ gcc/testsuite/gcc.dg/pr36093.c	2020-09-24 17:44:07.669462362 +0200
@@ -0,0 +1,31 @@
+/* { dg-do compile } */
+/* { dg-skip-if "small alignment" { pdp11-*-* } } */
+
+extern void abort (void);
+
+typedef struct Bar {
+      char c[129];
+} Bar __attribute__((__aligned__(128)));
+
+typedef struct Foo {
+      Bar bar[4];	/* { dg-error "size of array element is not a multiple of its alignment" } */
+} Foo;
+
+Foo foo[4];
+
+int main()
+{
+   int i, j;
+   Foo *foop = &foo[0];
+
+   for (i=0; i < 4; i++) {
+      Bar *bar = &foop->bar[i];
+      for (j=0; j < 129; j++) {
+         bar->c[j] = 'a' + i;
+      }
+   }
+
+   if (foo[0].bar[3].c[128] != 'd')
+     abort ();
+   return 0;
+}
--- gcc/testsuite/gcc.dg/pr43783.c.jj	2020-09-24 17:45:31.138278901 +0200
+++ gcc/testsuite/gcc.dg/pr43783.c	2020-09-24 17:45:57.326907590 +0200
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-options "" } */
+/* { dg-skip-if "small alignment" { pdp11-*-* } } */
+
+typedef __attribute__((aligned(16)))
+struct {
+  unsigned long long w[3];
+} UINT192;
+
+UINT192 bid_Kx192[32];	/* { dg-error "size of array element is not a multiple of its alignment" } */
+
+extern void abort (void);
+
+int main()
+{
+  int i = 0;
+  unsigned long x = 0;
+  for (i = 0; i < 32; ++i)
+    bid_Kx192[i].w[1] = i == 1;
+  for (i = 0; i < 32; ++i)
+    x += bid_Kx192[1].w[1];
+  if (x != 32)
+    abort ();
+  return 0;
+}

	Jakub



More information about the Gcc-patches mailing list