OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sem_ch5.adb (One_Bound): Remove call to Resolve... 

* sem_ch5.adb (One_Bound): Remove call to Resolve, as the bound needs
	to be resolved later as part of Analyze_Iteration_Scheme's call to
	Make_Index.

From-SVN: r91893
This commit is contained in:
Arnaud Charlet 2004-12-08 12:48:38 +01:00
parent 6e73e3ab00
commit e2d6a9e577
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gcc/ada/sem_ch5.adb
View File

@ -149,7 +149,7 @@ package body Sem_Ch5 is
elsif Nkind (N) = N_Indexed_Component then elsif Nkind (N) = N_Indexed_Component then
Diagnose_Non_Variable_Lhs (Prefix (N)); Diagnose_Non_Variable_Lhs (Prefix (N));
-- Another special case for assignment to discriminant. -- Another special case for assignment to discriminant
elsif Nkind (N) = N_Selected_Component then elsif Nkind (N) = N_Selected_Component then
if Present (Entity (Selector_Name (N))) if Present (Entity (Selector_Name (N)))
@ -939,7 +939,7 @@ package body Sem_Ch5 is
-- Analyze_If_Statement -- -- Analyze_If_Statement --
-------------------------- --------------------------
-- A special complication arises in the analysis of if statements. -- A special complication arises in the analysis of if statements
-- The expander has circuitry to completely delete code that it -- The expander has circuitry to completely delete code that it
-- can tell will not be executed (as a result of compile time known -- can tell will not be executed (as a result of compile time known
@ -1141,20 +1141,23 @@ package body Sem_Ch5 is
--------------- ---------------
function One_Bound (Bound : Node_Id) return Node_Id is function One_Bound (Bound : Node_Id) return Node_Id is
Assign : Node_Id; Assign : Node_Id;
Id : Entity_Id; Id : Entity_Id;
Decl : Node_Id; Decl : Node_Id;
Decl_Typ : Entity_Id;
begin begin
-- If the bound is a constant or an object, no need for a -- If the bound is a constant or an object, no need for a
-- separate declaration. If the bound is the result of previous -- separate declaration. If the bound is the result of previous
-- expansion it is already analyzed and should not be modified. -- expansion it is already analyzed and should not be modified.
-- Note that the Bound will be resolved later, if needed, as
-- part of the call to Make_Index (literal bounds may need to
-- be resolved to type Integer).
if Nkind (Bound) = N_Integer_Literal if Nkind (Bound) = N_Integer_Literal
or else Is_Entity_Name (Bound) or else Is_Entity_Name (Bound)
or else Analyzed (Bound) or else Analyzed (Bound)
then then
Resolve (Bound, Typ);
return Bound; return Bound;
end if; end if;
@ -1162,10 +1165,20 @@ package body Sem_Ch5 is
Make_Defining_Identifier (Loc, Make_Defining_Identifier (Loc,
Chars => New_Internal_Name ('S')); Chars => New_Internal_Name ('S'));
-- If the type of the discrete range is Universal_Integer, then
-- the bound's type must be resolved to Integer, so the object
-- used to hold the bound must also have type Integer.
if Typ = Universal_Integer then
Decl_Typ := Standard_Integer;
else
Decl_Typ := Typ;
end if;
Decl := Decl :=
Make_Object_Declaration (Loc, Make_Object_Declaration (Loc,
Defining_Identifier => Id, Defining_Identifier => Id,
Object_Definition => New_Occurrence_Of (Typ, Loc)); Object_Definition => New_Occurrence_Of (Decl_Typ, Loc));
Insert_Before (Parent (N), Decl); Insert_Before (Parent (N), Decl);
Analyze (Decl); Analyze (Decl);
@ -1559,7 +1572,7 @@ package body Sem_Ch5 is
Analyze (Identifier (S)); Analyze (Identifier (S));
Lab := Entity (Identifier (S)); Lab := Entity (Identifier (S));
-- If we found a label mark it as reachable. -- If we found a label mark it as reachable
if Ekind (Lab) = E_Label then if Ekind (Lab) = E_Label then
Generate_Definition (Lab); Generate_Definition (Lab);