* gcc-interfaces/decl.c (gnat_to_gnu_entity): Do not create a new

	TYPE_DECL when a type is padded if there is already one and reset
	TYPE_STUB_DECL in this case.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153053 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6fef8cc..5d69cee 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-21  Eric Botcazou  <ebotcazou@adacore.com>
 
+       * gcc-interfaces/decl.c (gnat_to_gnu_entity): Do not create a new
+       TYPE_DECL when a type is padded if there is already one and reset
+       TYPE_STUB_DECL in this case.
+
+2009-10-21  Eric Botcazou  <ebotcazou@adacore.com>
+
        * gcc-interfaces/utils.c (create_subprog_decl): Do not redefine
        main_identifier_node.
 

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index a2af179..70ced84 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -4436,7 +4436,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
         us when we make the new TYPE_DECL below.  */
       if (gnu_size || align > 0)
        gnu_type = maybe_pad_type (gnu_type, gnu_size, align, gnat_entity,
-                                  false, true, definition, false);
+                                  false, !gnu_decl, definition, false);
 
       if (TYPE_IS_PADDING_P (gnu_type))
        {
@@ -4555,7 +4555,10 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
                                     !Comes_From_Source (gnat_entity),
                                     debug_info_p, gnat_entity);
       else
-       TREE_TYPE (gnu_decl) = gnu_type;
+       {
+         TREE_TYPE (gnu_decl) = gnu_type;
+         TYPE_STUB_DECL (gnu_type) = gnu_decl;
+       }
     }
 
   if (is_type && !TYPE_IS_DUMMY_P (TREE_TYPE (gnu_decl)))