From 4eff8521e15042878285e2077afbb84c2b20e920 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 26 Jun 2015 21:31:13 +0000
Subject: [PATCH] 	PR c++/66216 	* class.c (finish_struct): Call
 fixup_attribute_variants.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225087 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                    |  3 +++
 gcc/cp/class.c                      |  1 +
 gcc/testsuite/g++.dg/ext/attrib52.C | 15 +++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/ext/attrib52.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5bfebe2359f1..719ba06b346f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2015-06-26  Jason Merrill  <jason@redhat.com>
 
+	PR c++/66216
+	* class.c (finish_struct): Call fixup_attribute_variants.
+
 	PR c++/66684
 	* typeck2.c (merge_exception_specifiers): Allow different
 	noexcept-specifiers if we've had errors.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index f4e4f8588e15..be31de21d3bd 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6820,6 +6820,7 @@ finish_struct (tree t, tree attributes)
   unreverse_member_declarations (t);
 
   cplus_decl_attributes (&t, attributes, (int) ATTR_FLAG_TYPE_IN_PLACE);
+  fixup_attribute_variants (t);
 
   /* Nadger the current location so that diagnostics point to the start of
      the struct, not the end.  */
diff --git a/gcc/testsuite/g++.dg/ext/attrib52.C b/gcc/testsuite/g++.dg/ext/attrib52.C
new file mode 100644
index 000000000000..e33556c97980
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attrib52.C
@@ -0,0 +1,15 @@
+// PR c++/66216
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+class CMymy
+{
+  unsigned char _a;
+  unsigned char _b;
+public:
+  constexpr CMymy() : _a(), _b() {}
+
+  constexpr CMymy(const CMymy &) = default;
+  CMymy &operator=(const CMymy &) = default;
+
+} __attribute__((aligned(2)));
-- 
2.11.4.GIT