mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 21:41:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

itypes.adb (Create_Itype): Use new name Access_Subprogram_Kind

Browse Source 
2008-03-26  Robert Dewar  <dewar@adacore.com>

	* itypes.adb (Create_Itype): Use new name Access_Subprogram_Kind

	* sem_ch13.adb (Validate_Unchecked_Conversion): Give warning for
	unchecked conversion for different conventions only for subprogram
	pointers or on VMS.

From-SVN: r133570
This commit is contained in:
Robert Dewar 2008-03-26 08:40:27 +01:00 committed by Arnaud Charlet
parent f88ecba0bc
commit 0503c53a3f
2 changed files with 151 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/ada/itypes.adb
View File

@ -68,7 +68,7 @@ package body Itypes is
Set_Is_Frozen (Typ);
end if;
if Ekind in Access_Subprogram_Type_Kind then
if Ekind in Access_Subprogram_Kind then
Set_Can_Use_Internal_Rep (Typ, not Always_Compatible_Rep_On_Target);
end if;

298
gcc/ada/sem_ch13.adb
View File

@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2007, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2008, 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- --
@ -180,17 +180,16 @@ package body Sem_Ch13 is
and then Attribute_Name (N) = Name_Address
then
declare
Nam : Node_Id := Prefix (N);
P : Node_Id;
begin
while False
or else Nkind (Nam) = N_Selected_Component
or else Nkind (Nam) = N_Indexed_Component
loop
Nam := Prefix (Nam);
P := Prefix (N);
while Nkind_In (P, N_Selected_Component, N_Indexed_Component) loop
P := Prefix (P);
end loop;
if Is_Entity_Name (Nam) then
return Entity (Nam);
if Is_Entity_Name (P) then
return Entity (P);
end if;
end;
end if;
@ -1392,6 +1391,9 @@ package body Sem_Ch13 is
Set_Has_Small_Clause (U_Ent);
Set_Has_Small_Clause (Implicit_Base);
Set_Has_Non_Standard_Rep (Implicit_Base);
-- Recompute RM_Size, but shouldn't this be done in Freeze???
Set_Discrete_RM_Size (U_Ent);
end if;
end Small;
@ -1749,10 +1751,10 @@ package body Sem_Ch13 is
while Present (Decl) loop
DeclO := Original_Node (Decl);
if Comes_From_Source (DeclO)
and then Nkind (DeclO) /= N_Pragma
and then Nkind (DeclO) /= N_Use_Package_Clause
and then Nkind (DeclO) /= N_Use_Type_Clause
and then Nkind (DeclO) /= N_Implicit_Label_Declaration
and not Nkind_In (DeclO, N_Pragma,
N_Use_Package_Clause,
N_Use_Type_Clause,
N_Implicit_Label_Declaration)
then
Error_Msg_N
("this declaration not allowed in machine code subprogram",
@ -1769,9 +1771,9 @@ package body Sem_Ch13 is
while Present (Stmt) loop
StmtO := Original_Node (Stmt);
if Comes_From_Source (StmtO)
and then Nkind (StmtO) /= N_Pragma
and then Nkind (StmtO) /= N_Label
and then Nkind (StmtO) /= N_Code_Statement
and then not Nkind_In (StmtO, N_Pragma,
N_Label,
N_Code_Statement)
then
Error_Msg_N
("this statement is not allowed in machine code subprogram",
@ -2284,7 +2286,7 @@ package body Sem_Ch13 is
-- The only pragma of interest is Complete_Representation
if Chars (CC) = Name_Complete_Representation then
if Pragma_Name (CC) = Name_Complete_Representation then
CR_Pragma := CC;
end if;
@ -2346,13 +2348,12 @@ package body Sem_Ch13 is
elsif Present (Component_Clause (Comp)) then
-- Diagose duplicate rep clause, or check consistency
-- if this is inherited component. In a double fault,
-- if this is an inherited component. In a double fault,
-- there may be a duplicate inconsistent clause for an
-- inherited component.
if
Scope (Original_Record_Component (Comp)) = Rectype
or else Parent (Component_Clause (Comp)) = N
if Scope (Original_Record_Component (Comp)) = Rectype
or else Parent (Component_Clause (Comp)) = N
then
Error_Msg_Sloc := Sloc (Component_Clause (Comp));
Error_Msg_N ("component clause previously given#", CC);
@ -2360,7 +2361,6 @@ package body Sem_Ch13 is
else
declare
Rep1 : constant Node_Id := Component_Clause (Comp);
begin
if Intval (Position (Rep1)) /=
Intval (Position (CC))
@ -2371,7 +2371,6 @@ package body Sem_Ch13 is
then
Error_Msg_N ("component clause inconsistent "
& "with representation of ancestor", CC);
elsif Warn_On_Redundant_Constructs then
Error_Msg_N ("?redundant component clause "
& "for inherited component!", CC);
@ -2467,30 +2466,30 @@ package body Sem_Ch13 is
end loop;
-- Now that we have processed all the component clauses, check for
-- overlap. We have to leave this till last, since the components
-- can appear in any arbitrary order in the representation clause.
-- overlap. We have to leave this till last, since the components can
-- appear in any arbitrary order in the representation clause.
-- We do not need this check if all specified ranges were monotonic,
-- as recorded by Overlap_Check_Required being False at this stage.
-- This first section checks if there are any overlapping entries
-- at all. It does this by sorting all entries and then seeing if
-- there are any overlaps. If there are none, then that is decisive,
-- but if there are overlaps, they may still be OK (they may result
-- from fields in different variants).
-- This first section checks if there are any overlapping entries at
-- all. It does this by sorting all entries and then seeing if there are
-- any overlaps. If there are none, then that is decisive, but if there
-- are overlaps, they may still be OK (they may result from fields in
-- different variants).
if Overlap_Check_Required then
Overlap_Check1 : declare
OC_Fbit : array (0 .. Ccount) of Uint;
-- First-bit values for component clauses, the value is the
-- offset of the first bit of the field from start of record.
-- The zero entry is for use in sorting.
-- First-bit values for component clauses, the value is the offset
-- of the first bit of the field from start of record. The zero
-- entry is for use in sorting.
OC_Lbit : array (0 .. Ccount) of Uint;
-- Last-bit values for component clauses, the value is the
-- offset of the last bit of the field from start of record.
-- The zero entry is for use in sorting.
-- Last-bit values for component clauses, the value is the offset
-- of the last bit of the field from start of record. The zero
-- entry is for use in sorting.
OC_Count : Natural := 0;
-- Count of entries in OC_Fbit and OC_Lbit
@ -2548,10 +2547,10 @@ package body Sem_Ch13 is
end Overlap_Check1;
end if;
-- If Overlap_Check_Required is still True, then we have to do
-- the full scale overlap check, since we have at least two fields
-- that do overlap, and we need to know if that is OK since they
-- are in the same variant, or whether we have a definite problem
-- If Overlap_Check_Required is still True, then we have to do the full
-- scale overlap check, since we have at least two fields that do
-- overlap, and we need to know if that is OK since they are in
-- different variant, or whether we have a definite problem.
if Overlap_Check_Required then
Overlap_Check2 : declare
@ -2569,7 +2568,7 @@ package body Sem_Ch13 is
-- Loop through all components in record. For each component check
-- for overlap with any of the preceding elements on the component
-- list containing the component, and also, if the component is in
-- list containing the component and also, if the component is in
-- a variant, check against components outside the case structure.
-- This latter test is repeated recursively up the variant tree.
@ -2597,7 +2596,7 @@ package body Sem_Ch13 is
Component_List_Loop : loop
-- If derived type definition, go to full declaration
-- If at outer level, check discriminants if there are any
-- If at outer level, check discriminants if there are any.
if Nkind (Clist) = N_Derived_Type_Definition then
Clist := Parent (Clist);
@ -2605,8 +2604,8 @@ package body Sem_Ch13 is
-- Outer level of record definition, check discriminants
if Nkind (Clist) = N_Full_Type_Declaration
or else Nkind (Clist) = N_Private_Type_Declaration
if Nkind_In (Clist, N_Full_Type_Declaration,
N_Private_Type_Declaration)
then
if Has_Discriminants (Defining_Identifier (Clist)) then
C2_Ent :=
@ -2644,23 +2643,22 @@ package body Sem_Ch13 is
-- be a variant, in which case its parent is a variant part,
-- and the parent of the variant part is a component list
-- whose components must all be checked against the current
-- component for overlap.
-- component for overlap).
if Nkind (Parent (Clist)) = N_Variant then
Clist := Parent (Parent (Parent (Clist)));
-- Check for possible discriminant part in record, this is
-- treated essentially as another level in the recursion.
-- For this case we have the parent of the component list
-- is the record definition, and its parent is the full
-- type declaration which contains the discriminant
-- specifications.
-- For this case the parent of the component list is the
-- record definition, and its parent is the full type
-- declaration containing the discriminant specifications.
elsif Nkind (Parent (Clist)) = N_Record_Definition then
Clist := Parent (Parent ((Clist)));
-- If neither of these two cases, we are at the top of
-- the tree
-- the tree.
else
exit Component_List_Loop;
@ -2674,24 +2672,23 @@ package body Sem_Ch13 is
end Overlap_Check2;
end if;
-- For records that have component clauses for all components, and
-- whose size is less than or equal to 32, we need to know the size
-- in the front end to activate possible packed array processing
-- where the component type is a record.
-- For records that have component clauses for all components, and whose
-- size is less than or equal to 32, we need to know the size in the
-- front end to activate possible packed array processing where the
-- component type is a record.
-- At this stage Hbit + 1 represents the first unused bit from all
-- the component clauses processed, so if the component clauses are
-- At this stage Hbit + 1 represents the first unused bit from all the
-- component clauses processed, so if the component clauses are
-- complete, then this is the length of the record.
-- For records longer than System.Storage_Unit, and for those where
-- not all components have component clauses, the back end determines
-- the length (it may for example be appopriate to round up the size
-- to some convenient boundary, based on alignment considerations etc).
-- For records longer than System.Storage_Unit, and for those where not
-- all components have component clauses, the back end determines the
-- length (it may for example be appopriate to round up the size
-- to some convenient boundary, based on alignment considerations, etc).
if Unknown_RM_Size (Rectype)
and then Hbit + 1 <= 32
then
-- Nothing to do if at least one component with no component clause
if Unknown_RM_Size (Rectype) and then Hbit + 1 <= 32 then
-- Nothing to do if at least one component has no component clause
Comp := First_Component_Or_Discriminant (Rectype);
while Present (Comp) loop
@ -2722,9 +2719,7 @@ package body Sem_Ch13 is
-- If no Complete_Representation pragma, warn if missing components
elsif Warn_On_Unrepped_Components
and then not Warnings_Off (Rectype)
then
elsif Warn_On_Unrepped_Components then
declare
Num_Repped_Components : Nat := 0;
Num_Unrepped_Components : Nat := 0;
@ -2736,7 +2731,6 @@ package body Sem_Ch13 is
while Present (Comp) loop
if Present (Component_Clause (Comp)) then
Num_Repped_Components := Num_Repped_Components + 1;
else
Num_Unrepped_Components := Num_Unrepped_Components + 1;
end if;
@ -2763,6 +2757,7 @@ package body Sem_Ch13 is
and then (Is_Scalar_Type (Underlying_Type (Etype (Comp)))
or else Size_Known_At_Compile_Time
(Underlying_Type (Etype (Comp))))
and then not Has_Warnings_Off (Rectype)
then
Error_Msg_Sloc := Sloc (Comp);
Error_Msg_NE
@ -2786,9 +2781,9 @@ package body Sem_Ch13 is
if Present (Component_Clause (C1_Ent))
and then Present (Component_Clause (C2_Ent))
then
-- Exclude odd case where we have two tag fields in the same
-- record, both at location zero. This seems a bit strange,
-- but it seems to happen in some circumstances ???
-- Exclude odd case where we have two tag fields in the same record,
-- both at location zero. This seems a bit strange, but it seems to
-- happen in some circumstances ???
if Chars (C1_Ent) = Name_uTag
and then Chars (C2_Ent) = Name_uTag
@ -2830,14 +2825,14 @@ package body Sem_Ch13 is
U_Ent : Entity_Id)
is
procedure Check_At_Constant_Address (Nod : Node_Id);
-- Checks that the given node N represents a name whose 'Address
-- is constant (in the same sense as OK_Constant_Address_Clause,
-- i.e. the address value is the same at the point of declaration
-- of U_Ent and at the time of elaboration of the address clause.
-- Checks that the given node N represents a name whose 'Address is
-- constant (in the same sense as OK_Constant_Address_Clause, i.e. the
-- address value is the same at the point of declaration of U_Ent and at
-- the time of elaboration of the address clause.
procedure Check_Expr_Constants (Nod : Node_Id);
-- Checks that Nod meets the requirements for a constant address
-- clause in the sense of the enclosing procedure.
-- Checks that Nod meets the requirements for a constant address clause
-- in the sense of the enclosing procedure.
procedure Check_List_Constants (Lst : List_Id);
-- Check that all elements of list Lst meet the requirements for a
@ -2937,11 +2932,11 @@ package body Sem_Ch13 is
-- If the node is an object declaration without initial
-- value, some code has been expanded, and the expression
-- is not constant, even if the constituents might be
-- acceptable, as in A'Address + offset.
-- acceptable, as in A'Address + offset.
if Ekind (Ent) = E_Variable
and then Nkind (Declaration_Node (Ent))
= N_Object_Declaration
and then
Nkind (Declaration_Node (Ent)) = N_Object_Declaration
and then
No (Expression (Declaration_Node (Ent)))
then
@ -2981,16 +2976,16 @@ package body Sem_Ch13 is
or else
Ekind (Ent) = E_In_Parameter
then
-- This is the case where we must have Ent defined
-- before U_Ent. Clearly if they are in different
-- units this requirement is met since the unit
-- containing Ent is already processed.
-- This is the case where we must have Ent defined before
-- U_Ent. Clearly if they are in different units this
-- requirement is met since the unit containing Ent is
-- already processed.
if not In_Same_Source_Unit (Ent, U_Ent) then
return;
-- Otherwise location of Ent must be before the
-- location of U_Ent, that's what prior defined means.
-- Otherwise location of Ent must be before the location
-- of U_Ent, that's what prior defined means.
elsif Sloc (Ent) < Loc_U_Ent then
return;
@ -3107,15 +3102,15 @@ package body Sem_Ch13 is
when N_Unchecked_Type_Conversion =>
Check_Expr_Constants (Expression (Nod));
-- If this is a rewritten unchecked conversion, subtypes
-- in this node are those created within the instance.
-- To avoid order of elaboration issues, replace them
-- with their base types. Note that address clauses can
-- cause order of elaboration problems because they are
-- elaborated by the back-end at the point of definition,
-- and may mention entities declared in between (as long
-- as everything is static). It is user-friendly to allow
-- unchecked conversions in this context.
-- If this is a rewritten unchecked conversion, subtypes in
-- this node are those created within the instance. To avoid
-- order of elaboration issues, replace them with their base
-- types. Note that address clauses can cause order of
-- elaboration problems because they are elaborated by the
-- back-end at the point of definition, and may mention
-- entities declared in between (as long as everything is
-- static). It is user-friendly to allow unchecked conversions
-- in this context.
if Nkind (Original_Node (Nod)) = N_Function_Call then
Set_Etype (Expression (Nod),
@ -3275,7 +3270,7 @@ package body Sem_Ch13 is
if Siz < M then
-- Size is less than minimum size, but one possibility remains
-- that we can manage with the new size if we bias the type
-- that we can manage with the new size if we bias the type.
M := UI_From_Int (Minimum_Size (UT, Biased => True));
@ -3347,9 +3342,8 @@ package body Sem_Ch13 is
else
declare
Id : constant Attribute_Id := Get_Attribute_Id (Chars (N));
begin
return Id = Attribute_Input
return Id = Attribute_Input
or else Id = Attribute_Output
or else Id = Attribute_Read
or else Id = Attribute_Write
@ -3397,7 +3391,7 @@ package body Sem_Ch13 is
-- we have short and long addresses, and it is possible for an access
-- type to have a short address size (and thus be less than the size
-- of System.Address itself). We simply skip the check for VMS, and
-- leave the back end to do the check.
-- leave it to the back end to do the check.
elsif Is_Access_Type (T) then
if OpenVMS_On_Target then
@ -3415,9 +3409,9 @@ package body Sem_Ch13 is
elsif Is_Discrete_Type (T) then
-- The following loop is looking for the nearest compile time
-- known bounds following the ancestor subtype chain. The idea
-- is to find the most restrictive known bounds information.
-- The following loop is looking for the nearest compile time known
-- bounds following the ancestor subtype chain. The idea is to find
-- the most restrictive known bounds information.
Ancest := T;
loop
@ -3453,17 +3447,17 @@ package body Sem_Ch13 is
end loop;
-- Fixed-point types. We can't simply use Expr_Value to get the
-- Corresponding_Integer_Value values of the bounds, since these
-- do not get set till the type is frozen, and this routine can
-- be called before the type is frozen. Similarly the test for
-- bounds being static needs to include the case where we have
-- unanalyzed real literals for the same reason.
-- Corresponding_Integer_Value values of the bounds, since these do not
-- get set till the type is frozen, and this routine can be called
-- before the type is frozen. Similarly the test for bounds being static
-- needs to include the case where we have unanalyzed real literals for
-- the same reason.
elsif Is_Fixed_Point_Type (T) then
-- The following loop is looking for the nearest compile time
-- known bounds following the ancestor subtype chain. The idea
-- is to find the most restrictive known bounds information.
-- The following loop is looking for the nearest compile time known
-- bounds following the ancestor subtype chain. The idea is to find
-- the most restrictive known bounds information.
Ancest := T;
loop
@ -3532,8 +3526,8 @@ package body Sem_Ch13 is
end if;
-- Signed case. Note that we consider types like range 1 .. -1 to be
-- signed for the purpose of computing the size, since the bounds
-- have to be accomodated in the base type.
-- signed for the purpose of computing the size, since the bounds have
-- to be accomodated in the base type.
if Lo < 0 or else Hi < 0 then
S := 1;
@ -3725,7 +3719,7 @@ package body Sem_Ch13 is
return True;
end if;
-- Otherwise check for incompleted type
-- Otherwise check for incomplete type
if Is_Incomplete_Or_Private_Type (T)
and then No (Underlying_Type (T))
@ -3827,23 +3821,22 @@ package body Sem_Ch13 is
if Is_Overloadable (T)
and then Nkind (N) = N_Pragma
and then (Chars (N) = Name_Convention
or else
Chars (N) = Name_Import
or else
Chars (N) = Name_Export
or else
Chars (N) = Name_External
or else
Chars (N) = Name_Interface)
then
null;
else
Record_Rep_Item (T, N);
declare
Pname : constant Name_Id := Pragma_Name (N);
begin
if Pname = Name_Convention or else
Pname = Name_Import or else
Pname = Name_Export or else
Pname = Name_External or else
Pname = Name_Interface
then
return False;
end if;
end;
end if;
-- Rep item was OK, not too late
Record_Rep_Item (T, N);
return False;
end Rep_Item_Too_Late;
@ -3919,8 +3912,8 @@ package body Sem_Ch13 is
return not Has_Non_Standard_Rep (T2);
end if;
-- Here the two types both have non-standard representation, and we
-- need to determine if they have the same non-standard representation
-- Here the two types both have non-standard representation, and we need
-- to determine if they have the same non-standard representation.
-- For arrays, we simply need to test if the component sizes are the
-- same. Pragma Pack is reflected in modified component sizes, so this
@ -4240,8 +4233,8 @@ package body Sem_Ch13 is
Target := Ancestor_Subtype (Etype (Act_Unit));
-- If either type is generic, the instantiation happens within a
-- generic unit, and there is nothing to check. The proper check
-- If either type is generic, the instantiation happens within a generic
-- unit, and there is nothing to check. The proper check
-- will happen when the enclosing generic is instantiated.
if Is_Generic_Type (Source) or else Is_Generic_Type (Target) then
@ -4271,8 +4264,17 @@ package body Sem_Ch13 is
and then Convention (Target) /= Convention (Source)
and then Warn_On_Unchecked_Conversion
then
Error_Msg_N
("?conversion between pointers with different conventions!", N);
-- Give warnings for subprogram pointers only on most targets. The
-- exception is VMS, where data pointers can have different lengths
-- depending on the pointer convention.
if Is_Access_Subprogram_Type (Target)
or else Is_Access_Subprogram_Type (Source)
or else OpenVMS_On_Target
then
Error_Msg_N
("?conversion between pointers with different conventions!", N);
end if;
end if;
-- Warn if one of the operands is Ada.Calendar.Time. Do not emit a
@ -4305,10 +4307,10 @@ package body Sem_Ch13 is
end;
end if;
-- Make entry in unchecked conversion table for later processing
-- by Validate_Unchecked_Conversions, which will check sizes and
-- alignments (using values set by the back-end where possible).
-- This is only done if the appropriate warning is active
-- Make entry in unchecked conversion table for later processing by
-- Validate_Unchecked_Conversions, which will check sizes and alignments
-- (using values set by the back-end where possible). This is only done
-- if the appropriate warning is active.
if Warn_On_Unchecked_Conversion then
Unchecked_Conversions.Append
@ -4330,10 +4332,10 @@ package body Sem_Ch13 is
end if;
end if;
-- If unchecked conversion to access type, and access type is
-- declared in the same unit as the unchecked conversion, then
-- set the No_Strict_Aliasing flag (no strict aliasing is
-- implicit in this situation).
-- If unchecked conversion to access type, and access type is declared
-- in the same unit as the unchecked conversion, then set the
-- No_Strict_Aliasing flag (no strict aliasing is implicit in this
-- situation).
if Is_Access_Type (Target) and then
In_Same_Source_Unit (Target, N)
@ -4344,7 +4346,7 @@ package body Sem_Ch13 is
-- Generate N_Validate_Unchecked_Conversion node for back end in
-- case the back end needs to perform special validation checks.
-- Shouldn't this be in exp_ch13, since the check only gets done
-- Shouldn't this be in Exp_Ch13, since the check only gets done
-- if we have full expansion and the back end is called ???
Vnode :=
@ -4352,8 +4354,8 @@ package body Sem_Ch13 is
Set_Source_Type (Vnode, Source);
Set_Target_Type (Vnode, Target);
-- If the unchecked conversion node is in a list, just insert before
-- it. If not we have some strange case, not worth bothering about.
-- If the unchecked conversion node is in a list, just insert before it.
-- If not we have some strange case, not worth bothering about.
if Is_List_Member (N) then
Insert_After (N, Vnode);
@ -4378,11 +4380,11 @@ package body Sem_Ch13 is
Target_Siz : Uint;
begin
-- This validation check, which warns if we have unequal sizes
-- for unchecked conversion, and thus potentially implementation
-- This validation check, which warns if we have unequal sizes for
-- unchecked conversion, and thus potentially implementation
-- dependent semantics, is one of the few occasions on which we
-- use the official RM size instead of Esize. See description
-- in Einfo "Handling of Type'Size Values" for details.
-- use the official RM size instead of Esize. See description in
-- Einfo "Handling of Type'Size Values" for details.
if Serious_Errors_Detected = 0
and then Known_Static_RM_Size (Source)