diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-22 11:03:53 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-22 11:03:53 +0200 |
| commit | 0d4aed994f4f2f3d5176a642c97912b3200e4660 (patch) | |
| tree | 8fc6c9e7e608d153c870cfea7021bcc9376b7a68 /gcc | |
| parent | b66cb57268bad05080062167eab68ef661a32231 (diff) | |
| download | gcc-0d4aed994f4f2f3d5176a642c97912b3200e4660.zip gcc-0d4aed994f4f2f3d5176a642c97912b3200e4660.tar.gz gcc-0d4aed994f4f2f3d5176a642c97912b3200e4660.tar.bz2 | |
exp_attr.adb (Expand_N_Attribute_Reference): In case of access attributes add missing support to handle designated types...
2008-08-22 Javier Miranda <miranda@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference): In case of access
attributes add missing support to handle designated types that come
from the limited view.
* exp_disp.adb (Expand_Interface_Conversion): Remove wrong assertion.
From-SVN: r139432
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 21 | ||||
| -rw-r--r-- | gcc/ada/exp_attr.adb | 28 | ||||
| -rw-r--r-- | gcc/ada/exp_disp.adb | 3 |
3 files changed, 45 insertions, 7 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ae30365..a7b793b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,24 @@ +2008-08-22 Ed Schonberg <schonberg@adacore.com> + + * sem_ch8.adb (Use_One_Type): when checking which of two use_type + clauses in related units is redundant, if one of the units is a package + instantiation, use its instance_spec to determine which unit is the + ancestor of the other. + +2008-08-22 Javier Miranda <miranda@adacore.com> + + * exp_attr.adb (Expand_N_Attribute_Reference): In case of access + attributes add missing support to handle designated types that come + from the limited view. + + * exp_disp.adb (Expand_Interface_Conversion): Remove wrong assertion. + +2008-08-22 Sergey Rybin <rybin@adacore.com> + + * vms_data.ads: Add entry for new gnatcheck -mNNN option + + * gnat_ugn.texi: Add description for gnatcheck option '-m' + 2008-08-22 Sergey Rybin <rybin@adacore.com> * gnat_ugn.texi: Update the gnatcheck subsection for metric rules diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index 80cd34d..f511178 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -657,8 +657,8 @@ package body Exp_Attr is Attribute_Unrestricted_Access => Access_Cases : declare - Btyp_DDT : constant Entity_Id := Directly_Designated_Type (Btyp); Ref_Object : constant Node_Id := Get_Referenced_Object (Pref); + Btyp_DDT : Entity_Id; function Enclosing_Object (N : Node_Id) return Node_Id; -- If N denotes a compound name (selected component, indexed @@ -692,6 +692,27 @@ package body Exp_Attr is -- Start of processing for Access_Cases begin + Btyp_DDT := Designated_Type (Btyp); + + -- Handle designated types that come from the limited view + + if Ekind (Btyp_DDT) = E_Incomplete_Type + and then From_With_Type (Btyp_DDT) + and then Present (Non_Limited_View (Btyp_DDT)) + then + Btyp_DDT := Non_Limited_View (Btyp_DDT); + + elsif Is_Class_Wide_Type (Btyp_DDT) + and then Ekind (Etype (Btyp_DDT)) = E_Incomplete_Type + and then From_With_Type (Etype (Btyp_DDT)) + and then Present (Non_Limited_View (Etype (Btyp_DDT))) + and then Present (Class_Wide_Type + (Non_Limited_View (Etype (Btyp_DDT)))) + then + Btyp_DDT := + Class_Wide_Type (Non_Limited_View (Etype (Btyp_DDT))); + end if; + -- In order to improve the text of error messages, the designated -- type of access-to-subprogram itypes is set by the semantics as -- the associated subprogram entity (see sem_attr). Now we replace @@ -882,11 +903,10 @@ package body Exp_Attr is if Btyp_DDT /= Etype (Ref_Object) then Rewrite (Prefix (N), - Convert_To (Directly_Designated_Type (Typ), + Convert_To (Btyp_DDT, New_Copy_Tree (Prefix (N)))); - Analyze_And_Resolve (Prefix (N), - Directly_Designated_Type (Typ)); + Analyze_And_Resolve (Prefix (N), Btyp_DDT); end if; -- When the object is an explicit dereference, convert the diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 84ea0b8..3d1f776 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -812,9 +812,6 @@ package body Exp_Disp is -- Acc2 : Iface2_Ref := Iface2_Ref (Acc); -- 2 if Is_Access_Type (Operand_Typ) then - pragma Assert - (Is_Interface (Directly_Designated_Type (Operand_Typ))); - Rewrite (N, Unchecked_Convert_To (Etype (N), Make_Function_Call (Loc, |