summaryrefslogtreecommitdiff
path: root/gcc/ada/exp_ch7.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-16 08:37:25 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-16 08:37:25 +0000
commit4f796e73c9a49932177598dec236babbc23821b6 (patch)
tree172b6ce07e68323d18783d5ee4d211a038c71d32 /gcc/ada/exp_ch7.adb
parentbd01c199deb32cd0305713a33cc60513795cb99d (diff)
downloadgcc-4f796e73c9a49932177598dec236babbc23821b6.tar.gz
2005-06-14 Ed Schonberg <schonberg@adacore.com>
* 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
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
-rw-r--r--gcc/ada/exp_ch7.adb8
1 files 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