From f03d2b738d5ea4ac40b6b8e09117b0ecda3ab80a Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Fri, 8 Sep 2017 07:18:20 +0000 Subject: [PATCH] Fix merge error. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@251862 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 ----- gcc/ada/gcc-interface/trans.c | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 94224d60783..11780492eb0 100644 --- 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 - - * gcc-interface/trans.c (gnat_to_gnu) : Try - again to translate the prefix after the field if it is incomplete. - 2017-09-06 Bob Duff * 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 5c85c4aa422..9163eb10a7c 100644 --- 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)) -- 2.11.4.GIT