* gcc-interface/decl.c (variant_desc): Rename 'record' to 'new_type'.

	(build_variant_list): Adjust to above renaming.
	(gnat_to_gnu_entity) <E_Record_Subtype>: Likewise.  Give a unique name
	to the type of the variant containers.
	(create_variant_part_from): Likewise.  Give a unique name to the type
	of the variant part.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187909 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3952a82..d5858f7 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-26  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/decl.c (variant_desc): Rename 'record' to 'new_type'.
+       (build_variant_list): Adjust to above renaming.
+       (gnat_to_gnu_entity) <E_Record_Subtype>: Likewise.  Give a unique name
+       to the type of the variant containers.
+       (create_variant_part_from): Likewise.  Give a unique name to the type
+       of the variant part.
+

 2012-05-25  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR ada/52362
 2012-05-25  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR ada/52362

diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 1fae317..3ea58e2 100644 (file)
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -124,8 +124,8 @@ typedef struct variant_desc_d {
   /* The value of the qualifier.  */
   tree qual;
 
   /* The value of the qualifier.  */
   tree qual;
 

-  /* The record associated with this variant.  */
-  tree record;
+  /* The type of the variant after transformation.  */
+  tree new_type;

 } variant_desc;
 
 DEF_VEC_O(variant_desc);
 } variant_desc;
 
 DEF_VEC_O(variant_desc);


@@ -3327,11 +3327,16 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
                      {
                        tree old_variant = v->type;
                        tree new_variant = make_node (RECORD_TYPE);
                      {
                        tree old_variant = v->type;
                        tree new_variant = make_node (RECORD_TYPE);

+                       tree suffix
+                         = concat_name (DECL_NAME (gnu_variant_part),
+                                        IDENTIFIER_POINTER
+                                        (DECL_NAME (v->field)));

                        TYPE_NAME (new_variant)
                        TYPE_NAME (new_variant)

-                         = DECL_NAME (TYPE_NAME (old_variant));
+                         = concat_name (TYPE_NAME (gnu_type),
+                                        IDENTIFIER_POINTER (suffix));

                        copy_and_substitute_in_size (new_variant, old_variant,
                                                     gnu_subst_list);
                        copy_and_substitute_in_size (new_variant, old_variant,
                                                     gnu_subst_list);

-                       v->record = new_variant;
+                       v->new_type = new_variant;

                      }
                }
              else
                      }
                }
              else


@@ -3435,7 +3440,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
                            if (selected_variant)
                              gnu_cont_type = gnu_type;
                            else
                            if (selected_variant)
                              gnu_cont_type = gnu_type;
                            else

-                             gnu_cont_type = v->record;
+                             gnu_cont_type = v->new_type;

                          }
                        else
                          /* The front-end may pass us "ghost" components if
                          }
                        else
                          /* The front-end may pass us "ghost" components if


@@ -8190,7 +8195,7 @@ build_variant_list (tree qual_union_type, VEC(subst_pair,heap) *subst_list,
          v->type = variant_type;
          v->field = gnu_field;
          v->qual = qual;
          v->type = variant_type;
          v->field = gnu_field;
          v->qual = qual;

-         v->record = NULL_TREE;
+         v->new_type = NULL_TREE;

 
          /* Recurse on the variant subpart of the variant, if any.  */
          variant_subpart = get_variant_part (variant_type);
 
          /* Recurse on the variant subpart of the variant, if any.  */
          variant_subpart = get_variant_part (variant_type);


@@ -8963,7 +8968,9 @@ create_variant_part_from (tree old_variant_part,
 
   /* First create the type of the variant part from that of the old one.  */
   new_union_type = make_node (QUAL_UNION_TYPE);
 
   /* First create the type of the variant part from that of the old one.  */
   new_union_type = make_node (QUAL_UNION_TYPE);

-  TYPE_NAME (new_union_type) = DECL_NAME (TYPE_NAME (old_union_type));
+  TYPE_NAME (new_union_type)
+    = concat_name (TYPE_NAME (record_type),
+                  IDENTIFIER_POINTER (DECL_NAME (old_variant_part)));

 
   /* If the position of the variant part is constant, subtract it from the
      size of the type of the parent to get the new size.  This manual CSE
 
   /* If the position of the variant part is constant, subtract it from the
      size of the type of the parent to get the new size.  This manual CSE


@@ -8997,7 +9004,7 @@ create_variant_part_from (tree old_variant_part,
        continue;
 
       /* Retrieve the list of fields already added to the new variant.  */
        continue;
 
       /* Retrieve the list of fields already added to the new variant.  */

-      new_variant = v->record;
+      new_variant = v->new_type;

       field_list = TYPE_FIELDS (new_variant);
 
       /* If the old variant had a variant subpart, we need to create a new
       field_list = TYPE_FIELDS (new_variant);
 
       /* If the old variant had a variant subpart, we need to create a new