From 4f796e73c9a49932177598dec236babbc23821b6 Mon Sep 17 00:00:00 2001 From: charlet Date: Thu, 16 Jun 2005 08:37:25 +0000 Subject: [PATCH] 2005-06-14 Ed Schonberg * exp_ch7.adb (Find_Node_To_Be_Wrapped): If the node appears within the entry_call alternative of a conditional entry call, wrap the conditional entry call itself. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101033 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/exp_ch7.adb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 4e300b9508f..bd18e62fc7d 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -291,7 +291,7 @@ package body Exp_Ch7 is -- controller but this would not tackle view conversions properly. -- - A classwide type can always potentially have controlled components -- but the record controller of the corresponding actual type may not - -- be nown at compile time so the dispatch table contains a special + -- be known at compile time so the dispatch table contains a special -- field that allows to compute the offset of the record controller -- dynamically. See s-finimp.Deep_Tag_Attach and a-tags.RC_Offset @@ -1758,7 +1758,11 @@ package body Exp_Ch7 is N_Procedure_Call_Statement => if Nkind (Parent (The_Parent)) = N_Entry_Call_Alternative and then - Nkind (Parent (Parent (The_Parent))) = N_Timed_Entry_Call + (Nkind (Parent (Parent (The_Parent))) + = N_Timed_Entry_Call + or else + Nkind (Parent (Parent (The_Parent))) + = N_Conditional_Entry_Call) then return Parent (Parent (The_Parent)); else -- 2.11.0