aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Vogt <vogt@linux.vnet.ibm.com>2016-04-29 09:20:06 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2016-04-29 09:20:06 +0000
commit509063ebd1859c83df189ac0df52ada49c75ba31 (patch)
tree7a4eb6e962868b8905da08956e19636914dca987
parent83745c0ddb708f90961d0b217a4f0cd5e80cd8c7 (diff)
downloadgcc-509063ebd1859c83df189ac0df52ada49c75ba31.zip
gcc-509063ebd1859c83df189ac0df52ada49c75ba31.tar.gz
gcc-509063ebd1859c83df189ac0df52ada49c75ba31.tar.bz2
PR/69089: C++-11: Ingore "alignas(0)".
gcc/c-family/ChangeLog: 2016-04-29 Dominik Vogt <vogt@linux.vnet.ibm.com> PR/69089 * c-common.c (handle_aligned_attribute): Allow 0 as an argument to the "aligned" attribute. gcc/testsuite/ChangeLog: 2016-04-29 Dominik Vogt <vogt@linux.vnet.ibm.com> PR/69089 * g++.dg/cpp0x/alignas6.C: New test. From-SVN: r235629
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-common.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/alignas6.C29
4 files changed, 41 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 9e1695e..f70dc0e 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-29 Dominik Vogt <vogt@linux.vnet.ibm.com>
+
+ PR/69089
+ * c-common.c (handle_aligned_attribute): Allow 0 as an argument to the
+ "aligned" attribute.
+
2016-04-28 Jason Merrill <jason@redhat.com>
* c-lex.c (c_common_has_attribute): Handle nodiscard.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index c086dee..b221979 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -7815,7 +7815,7 @@ handle_aligned_attribute (tree *node, tree ARG_UNUSED (name), tree args,
else if (TYPE_P (*node))
type = node, is_type = 1;
- if ((i = check_user_alignment (align_expr, false)) == -1
+ if ((i = check_user_alignment (align_expr, true)) == -1
|| !check_cxx_fundamental_alignment_constraints (*node, i, flags))
*no_add_attrs = true;
else if (is_type)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 020b08e..7dfa23d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2016-04-29 Dominik Vogt <vogt@linux.vnet.ibm.com>
+ PR/69089
+ * g++.dg/cpp0x/alignas6.C: New test.
+
+2016-04-29 Dominik Vogt <vogt@linux.vnet.ibm.com>
+
* gcc/testsuite/gcc.dg/cpp/mac-dir-2.c: Remove pointless duplicate
dg-do.
* gcc/testsuite/gcc.dg/pr27003.c: Likewise.
diff --git a/gcc/testsuite/g++.dg/cpp0x/alignas6.C b/gcc/testsuite/g++.dg/cpp0x/alignas6.C
new file mode 100644
index 0000000..f3252a9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/alignas6.C
@@ -0,0 +1,29 @@
+// PR c++/69089
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wno-attributes" }
+
+alignas (0) int valid1;
+alignas (1 - 1) int valid2;
+struct Tvalid
+{
+ alignas (0) int i;
+ alignas (2 * 0) int j;
+};
+
+alignas (-1) int invalid1; /* { dg-error "not a positive power of 2" } */
+alignas (1 - 2) int invalid2; /* { dg-error "not a positive power of 2" } */
+struct Tinvalid
+{
+ alignas (-1) int i; /* { dg-error "not a positive power of 2" } */
+ alignas (2 * 0 - 1) int j; /* { dg-error "not a positive power of 2" } */
+};
+
+template <int N> struct TNvalid1 { alignas (N) int i; };
+TNvalid1<0> SNvalid1;
+template <int N> struct TNvalid2 { alignas (N) int i; };
+TNvalid2<1 - 1> SNvalid2;
+
+template <int N> struct TNinvalid1 { alignas (N) int i; }; /* { dg-error "not a positive power of 2" } */
+TNinvalid1<-1> SNinvalid1;
+template <int N> struct TNinvalid2 { alignas (N) int i; }; /* { dg-error "not a positive power of 2" } */
+TNinvalid2<1 - 2> SNinvalid2;