From 2ec3af9cde65d410eb736c96300293c335476316 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 5 May 2010 19:46:41 +0000
Subject: [PATCH] 	PR debug/43370 	* c-common.c
 (handle_aligned_attribute): Respect 	ATTR_FLAG_TYPE_IN_PLACE.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159081 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                       | 4 ++++
 gcc/c-common.c                      | 8 +++++---
 gcc/testsuite/ChangeLog             | 5 +++++
 gcc/testsuite/g++.dg/ext/attrib39.C | 9 +++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/ext/attrib39.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c9263d793c..aef0c30782b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-05  Jason Merrill  <jason@redhat.com>
 
+	PR debug/43370
+	* c-common.c (handle_aligned_attribute): Respect
+	ATTR_FLAG_TYPE_IN_PLACE.
+
 	PR testsuite/43758
 	* target.h (struct gcc_target): Add attribute_takes_identifier_p.
 	* target_def.h (TARGET_ATTRIBUTE_TAKES_IDENTIFIER_P): Define.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 6fa577c293a..b3254b2386e 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -6695,10 +6695,12 @@ handle_aligned_attribute (tree *node, tree ARG_UNUSED (name), tree args,
     }
   else if (is_type)
     {
+      if ((flags & (int) ATTR_FLAG_TYPE_IN_PLACE))
+	/* OK, modify the type in place.  */;
       /* If we have a TYPE_DECL, then copy the type, so that we
 	 don't accidentally modify a builtin type.  See pushdecl.  */
-      if (decl && TREE_TYPE (decl) != error_mark_node
-	  && DECL_ORIGINAL_TYPE (decl) == NULL_TREE)
+      else if (decl && TREE_TYPE (decl) != error_mark_node
+	       && DECL_ORIGINAL_TYPE (decl) == NULL_TREE)
 	{
 	  tree tt = TREE_TYPE (decl);
 	  *type = build_variant_type_copy (*type);
@@ -6707,7 +6709,7 @@ handle_aligned_attribute (tree *node, tree ARG_UNUSED (name), tree args,
 	  TREE_USED (*type) = TREE_USED (decl);
 	  TREE_TYPE (decl) = *type;
 	}
-      else if (!(flags & (int) ATTR_FLAG_TYPE_IN_PLACE))
+      else
 	*type = build_variant_type_copy (*type);
 
       TYPE_ALIGN (*type) = (1U << i) * BITS_PER_UNIT;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3ff322094b3..0bd021986ae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-05  Jason Merrill  <jason@redhat.com>
+
+	PR debug/43370
+	* g++.dg/ext/attrib39.C: New.
+
 2010-05-05  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/24978
diff --git a/gcc/testsuite/g++.dg/ext/attrib39.C b/gcc/testsuite/g++.dg/ext/attrib39.C
new file mode 100644
index 00000000000..22a742942cb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attrib39.C
@@ -0,0 +1,9 @@
+// PR debug/43370
+// { dg-options "-g" }
+
+int fragile_block(void) {
+  typedef __attribute__ ((aligned (16))) struct {
+    int i;
+  } XmmUint16;
+  return 0;
+}
-- 
2.11.0