diff options
| author | Javier Miranda <miranda@adacore.com> | 2007-10-15 15:54:33 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2007-10-15 15:54:33 +0200 |
| commit | 3192631e2438b31b79d6aa9873b6ed83417af857 (patch) | |
| tree | fb3a6d59691d6a973613b8dc96d68d7f6b924971 /gcc/ada/exp_disp.adb | |
| parent | a8ee464537c3a5e4ec0c4e15fed38edb9cd567e6 (diff) | |
| download | gcc-3192631e2438b31b79d6aa9873b6ed83417af857.zip gcc-3192631e2438b31b79d6aa9873b6ed83417af857.tar.gz gcc-3192631e2438b31b79d6aa9873b6ed83417af857.tar.bz2 | |
exp_attr.adb (Expand_N_Attribute_Reference): Case Access, Unchecked_Access, and Unrestricted_Access.
2007-10-15 Javier Miranda <miranda@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference): Case Access,
Unchecked_Access, and Unrestricted_Access. Cleanup code that takes
care of access to class-wide interface types plus removal of bizarre
conversion of tagged object to access type (reported by Gary
Dismukes). After this patch there is no need to perform any
additional management on these nodes in Expand_Interface_Actuals.
* exp_disp.adb (Expand_Interface_Actuals): Code cleanup. Remove code
that handles use of 'Access and 'Unchecked_Access applied to
actuals covering interface types. Such code is now
centralized in Expand_N_Attribute_Reference.
From-SVN: r129322
Diffstat (limited to 'gcc/ada/exp_disp.adb')
| -rw-r--r-- | gcc/ada/exp_disp.adb | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/gcc/ada/exp_disp.adb b/gcc/ada/exp_disp.adb index 54e08c6..20cf387 100644 --- a/gcc/ada/exp_disp.adb +++ b/gcc/ada/exp_disp.adb @@ -1011,7 +1011,6 @@ package body Exp_Disp is ------------------------------ procedure Expand_Interface_Actuals (Call_Node : Node_Id) is - Loc : constant Source_Ptr := Sloc (Call_Node); Actual : Node_Id; Actual_Dup : Node_Id; Actual_Typ : Entity_Id; @@ -1020,7 +1019,6 @@ package body Exp_Disp is Formal : Entity_Id; Formal_Typ : Entity_Id; Subp : Entity_Id; - Nam : Name_Id; Formal_DDT : Entity_Id; Actual_DDT : Entity_Id; @@ -1106,18 +1104,13 @@ package body Exp_Disp is (Attribute_Name (Actual) = Name_Access or else Attribute_Name (Actual) = Name_Unchecked_Access) then - Nam := Attribute_Name (Actual); + -- This case must have been handled by the analysis and + -- expansion of 'Access. The only exception is when types + -- match and no further expansion is required. - Conversion := Convert_To (Formal_DDT, Prefix (Actual)); - Rewrite (Actual, Conversion); - Analyze_And_Resolve (Actual, Formal_DDT); - - Rewrite (Actual, - Unchecked_Convert_To (Formal_Typ, - Make_Attribute_Reference (Loc, - Prefix => Relocate_Node (Actual), - Attribute_Name => Nam))); - Analyze_And_Resolve (Actual, Formal_Typ); + pragma Assert (Base_Type (Etype (Prefix (Actual))) + = Base_Type (Formal_DDT)); + null; -- No need to displace the pointer if the type of the actual -- coincides with the type of the formal. |