diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-15 09:37:43 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-15 09:37:43 +0000 |
| commit | 18a40e9785d07da1e1f40b2a3a1c63144a40b64b (patch) | |
| tree | 9d0234798b82bda730e6be3efd6ad0682284e35d /gcc | |
| parent | 1f2ddf8c4cb070e93a59c2ac0c155ed871a09fe8 (diff) | |
| download | gcc-18a40e9785d07da1e1f40b2a3a1c63144a40b64b.tar.gz | |
2006-02-13 Robert Dewar <dewar@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference, case Mechanism_Code): If
attribute Mechanism_Code is applied to renamed subprogram, modify
prefix to point to base subprogram.
Max/Min attributes now violate Restriction No_Implicit_Conditionals
* sinfo.ads: Document that Mechanism_Code cannot be applied to
renamed subprograms so that the front-end must replace the prefix
appropriately.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111058 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/exp_attr.adb | 46 | ||||
| -rw-r--r-- | gcc/ada/sinfo.ads | 6 |
2 files changed, 36 insertions, 16 deletions
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index 11bc258d86e..3f23d7cb66b 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1977,7 +1977,7 @@ package body Exp_Attr is -- values. if Is_Unchecked_Union (Base_Type (U_Type)) - and then not Present (Discriminant_Constraint (U_Type)) + and then No (Discriminant_Constraint (U_Type)) then Insert_Action (N, Make_Raise_Program_Error (Loc, @@ -2382,6 +2382,20 @@ package body Exp_Attr is Analyze_And_Resolve (N, Typ); end Mantissa; + -------------------- + -- Mechanism_Code -- + -------------------- + + when Attribute_Mechanism_Code => + + -- We must replace the prefix in the renamed case + + if Is_Entity_Name (Pref) + and then Present (Alias (Entity (Pref))) + then + Set_Renamed_Subprogram (Pref, Alias (Entity (Pref))); + end if; + --------- -- Mod -- --------- @@ -2659,7 +2673,7 @@ package body Exp_Attr is -- values. if Is_Unchecked_Union (Base_Type (U_Type)) - and then not Present (Discriminant_Constraint (U_Type)) + and then No (Discriminant_Constraint (U_Type)) then Insert_Action (N, Make_Raise_Program_Error (Loc, @@ -2855,7 +2869,6 @@ package body Exp_Attr is elsif not Overflow_Checks_Suppressed (Ptyp) then Expand_Pred_Succ (N); end if; - end Pred; ------------------ @@ -2915,7 +2928,6 @@ package body Exp_Attr is else Apply_Universal_Integer_Attribute_Checks (N); end if; - end Range_Length; ---------- @@ -3424,7 +3436,7 @@ package body Exp_Attr is -- Typ (Adjust_Storage_Size (taskV!(name)._Size)) else - if not Present (Storage_Size_Variable (Ptyp)) then + if No (Storage_Size_Variable (Ptyp)) then Rewrite (N, Convert_To (Typ, Make_Function_Call (Loc, @@ -4468,22 +4480,26 @@ package body Exp_Attr is when Attribute_Component_Size => null; - -- The following attributes are handled by Gigi (except that static - -- cases have already been evaluated by the semantics, but in any case - -- Gigi should not count on that). + -- The following attributes are handled by the back end (except that + -- static cases have already been evaluated during semantic processing, + -- but in any case the back end should not count on this). The one bit + -- of special processing required is that these attributes typically + -- generate conditionals in the code, so we need to check the relevant + -- restriction. + + when Attribute_Max | + Attribute_Min => + Check_Restriction (No_Implicit_Conditionals, N); - -- In addition Gigi handles the non-floating-point cases of Pred and - -- Succ (including the fixed-point cases, which can just be treated as - -- integer increment/decrement operations) + -- The following attributes are handled by the back end (except that + -- static cases have already been evaluated during semantic processing, + -- but in any case the back end should not count on this). -- Gigi also handles the non-class-wide cases of Size when Attribute_Bit_Order | Attribute_Code_Address | Attribute_Definite | - Attribute_Max | - Attribute_Mechanism_Code | - Attribute_Min | Attribute_Null_Parameter | Attribute_Passed_By_Reference | Attribute_Pool_Address => diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index bf5edbc4e65..2712ed0c4fc 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2006, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -2975,6 +2975,10 @@ package Sinfo is -- a non-standard enumeration type or a nonzero/zero semantics -- boolean type, so the value is simply the stored representation. + -- Gigi requirement: For the Mechanism_Code attribute, if the prefix + -- references a subprogram that is a renaming, then the front end must + -- rewrite the attribute to refer directly to the renamed entity. + -- Note: In generated code, the Address and Unrestricted_Access -- attributes can be applied to any expression, and the meaning is -- to create an object containing the value (the object is in the |