Fix merge error.

From-SVN: r251862

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 94224d6078347f55b5e2576c2cc5718dfe26983b..11780492eb0832e2600ce28d0dbb284af672100c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -533,11 +533,6 @@
        * sem_ch5.adb (Analyze_Block_Statement): Revert previous change.
        * sem_warn.adb (Check_References): Revert previous change.
 
-2017-09-06  Eric Botcazou  <ebotcazou@adacore.com>
-
-        * gcc-interface/trans.c (gnat_to_gnu) <N_Selected_Component>: Try
-        again to translate the prefix after the field if it is incomplete.
-
 2017-09-06  Bob Duff  <duff@adacore.com>
 
        * exp_util.adb (Is_Displace_Call): Make sure it works for indirect

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 5c85c4aa4222847d811897acb5d3eb95e198a552..9163eb10a7c86eb901229b34c00406916134cea3 100644 (file)
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -6465,17 +6465,6 @@ gnat_to_gnu (Node_Id gnat_node)
          {
            tree gnu_field = gnat_to_gnu_field_decl (gnat_field);
 
-           /* If the prefix has incomplete type, try again to translate it.
-              The idea is that the translation of the field just above may
-              have completed it through gnat_to_gnu_entity, in case it is
-              the dereference of an access to Taft Amendment type used in
-              the instantiation of a generic body from an external unit.  */
-           if (!COMPLETE_TYPE_P (TREE_TYPE (gnu_prefix)))
-             {
-               gnu_prefix = gnat_to_gnu (gnat_prefix);
-               gnu_prefix = maybe_implicit_deref (gnu_prefix);
-             }
-               
            gnu_result
              = build_component_ref (gnu_prefix, gnu_field,
                                     (Nkind (Parent (gnat_node))