+2014-07-30 Robert Dewar <dewar@adacore.com>
+
+ * exp_ch7.adb, checks.adb, makeutl.adb, makeutl.ads: Minor reformatting.
+
+2014-07-30 Yannick Moy <moy@adacore.com>
+
+ * checks.ads: Fix typo in comment.
+
+2014-07-30 Pierre-Marie Derodat <derodat@adacore.com>
+
+ * sem_util.adb (Set_Debug_Info_Needed): For scalar types, recurse on
+ entities that materialize range bounds, if any.
+
+2014-07-30 Vincent Celier <celier@adacore.com>
+
+ * projects.texi: Minor spelling fix.
+
2014-07-30 Hristian Kirtchev <kirtchev@adacore.com>
* checks.adb (Make_Bignum_Block): Use the new secondary stack
function Make_Bignum_Block (Loc : Source_Ptr) return Node_Id is
M : constant Entity_Id := Make_Defining_Identifier (Loc, Name_uM);
-
begin
return
Make_Block_Statement (Loc,
Declarations =>
New_List (Build_SS_Mark_Call (Loc, M)),
-
Handled_Statement_Sequence =>
Make_Handled_Sequence_Of_Statements (Loc,
Statements => New_List (Build_SS_Release_Call (Loc, M))));
-- Similar to Determine_Range, but for a node N of floating-point type. OK
-- is True on return only for IEEE floating-point types and only if we do
-- not have to worry about extended precision (i.e. on the x86, we must be
- -- using -msse2 -mfpmath=sse. At the current time, this is used only in
+ -- using -msse2 -mfpmath=sse). At the current time, this is used only in
-- GNATprove, though we could consider using it more generally in future.
+ -- For that to happen, the possibility of arguments of infinite or NaN
+ -- value should be taken into account, which is not the case currently.
procedure Install_Null_Excluding_Check (N : Node_Id);
-- Determines whether an access node requires a runtime access check and
-- types where the designated type is explicitly derived from [Limited_]
-- Controlled.
- elsif VM_Target /= No_VM
- and then not Is_Controlled (Desig_Typ)
- then
+ elsif VM_Target /= No_VM and then not Is_Controlled (Desig_Typ) then
return;
-- Do not create finalization masters in SPARK mode because they result
-- When the finalizer acts solely as a clean up routine, the body
-- is inserted right after the spec.
- if Acts_As_Clean and then not Has_Ctrl_Objs then
+ if Acts_As_Clean and not Has_Ctrl_Objs then
Insert_After (Fin_Spec, Fin_Body);
-- In all other cases the body is inserted after either:
elsif Is_Access_Type (Obj_Typ)
and then Present (Status_Flag_Or_Transient_Decl (Obj_Id))
and then Nkind (Status_Flag_Or_Transient_Decl (Obj_Id)) =
- N_Object_Declaration
+ N_Object_Declaration
then
Processing_Actions (Has_No_Init => True);
elsif Ekind (Obj_Id) = E_Variable
and then not In_Library_Level_Package_Body (Obj_Id)
- and then
- (Is_Simple_Protected_Type (Obj_Typ)
- or else Has_Simple_Protected_Object (Obj_Typ))
+ and then (Is_Simple_Protected_Type (Obj_Typ)
+ or else Has_Simple_Protected_Object (Obj_Typ))
then
Processing_Actions (Is_Protected => True);
end if;
-- For constrained or tagged results escalate the condition to
-- include the allocation format. Generate:
- --
+
-- if BIPallocform > Secondary_Stack'Pos
-- and then BIPfinalizationmaster /= null
-- then
and then
(not Is_Library_Level_Entity (Spec_Id)
- -- Nested packages are considered to be library level entities,
- -- but do not need to be processed separately. True library level
- -- packages have a scope value of 1.
+ -- Nested packages are considered to be library level entities,
+ -- but do not need to be processed separately. True library level
+ -- packages have a scope value of 1.
- or else Scope_Depth_Value (Spec_Id) /= Uint_1
- or else (Is_Generic_Instance (Spec_Id)
- and then Package_Instantiation (Spec_Id) /= N))
+ or else Scope_Depth_Value (Spec_Id) /= Uint_1
+ or else (Is_Generic_Instance (Spec_Id)
+ and then Package_Instantiation (Spec_Id) /= N))
then
return;
end if;
begin
if Has_Discriminants (U_Typ)
and then Nkind (Parent (U_Typ)) = N_Full_Type_Declaration
- and then
- Nkind (Type_Definition (Parent (U_Typ))) = N_Record_Definition
+ and then Nkind (Type_Definition (Parent (U_Typ))) = N_Record_Definition
and then
Present
(Variant_Part (Component_List (Type_Definition (Parent (U_Typ)))))
-- it is not part of a statement list. The actions must be inserted
-- before the select itself, which is part of some list of statements.
-- Note that the triggering alternative includes the triggering
- -- statement and an optional statement list. If the node to be wrapped
- -- is part of that list, the normal insertion applies.
+ -- statement and an optional statement list. If the node to be
+ -- wrapped is part of that list, the normal insertion applies.
if Nkind (Parent (Node_To_Wrap)) = N_Triggering_Alternative
and then not Is_List_Member (Node_To_Wrap)
-- Deep_Finalize (Obj._parent, False);
- if Is_Tagged_Type (Typ)
- and then Is_Derived_Type (Typ)
- then
+ if Is_Tagged_Type (Typ) and then Is_Derived_Type (Typ) then
declare
Par_Typ : constant Entity_Id := Parent_Field_Type (Typ);
Call : Node_Id;
-- Finalize the object. This action must be performed first before
-- all components have been finalized.
- if Is_Controlled (Typ)
- and then not Is_Local
- then
+ if Is_Controlled (Typ) and then not Is_Local then
declare
Fin_Stmt : Node_Id;
Proc : Entity_Id;
-- Deal with non-tagged derivation of private views
- if Is_Untagged_Derivation (Typ)
- and then not Is_Conc
- then
+ if Is_Untagged_Derivation (Typ) and then not Is_Conc then
Utyp := Underlying_Type (Root_Type (Base_Type (Typ)));
Ref := Unchecked_Convert_To (Utyp, Ref);
-- declare
-- M : constant Mark_Id := SS_Mark;
-- procedure Finalizer is ... (See Build_Finalizer)
- --
+
-- begin
-- Temp := <Expr>; -- general case
-- Temp := (if <Expr> then True else False); -- boolean case
- --
+
-- at end
-- Finalizer;
-- end;
end if;
elsif Sw'Length >= 4
- and then (Sw (2 .. 3) = "aL"
- or else
- Sw (2 .. 3) = "aO"
- or else
- Sw (2 .. 3) = "aI"
- or else
- (For_Gnatbind and then Sw (2 .. 3) = "A="))
+ and then
+ (Sw (2 .. 3) = "aL" or else
+ Sw (2 .. 3) = "aO" or else
+ Sw (2 .. 3) = "aI"
+ or else (For_Gnatbind and then Sw (2 .. 3) = "A="))
then
Start := 4;
if Source.Id.Path.Name = Q.Table (J).Info.Id.Path.Name
and then Source.Id.Index = Q.Table (J).Info.Id.Index
and then Source.Id.Project.Path.Name =
- Q.Table (J).Info.Id.Project.Path.Name
+ Q.Table (J).Info.Id.Project.Path.Name
then
-- No need to insert this source in the queue, but still
-- return True as we may need to insert its roots.
else
Data.Closure_Needed :=
Has_Mains
- or else
- (Root_Project.Library
- and then Root_Project.Standalone_Library /= No);
+ or else (Root_Project.Library
+ and then Root_Project.Standalone_Library /= No);
Data.Need_Compilation := All_Phases or Option_Compile_Only;
Data.Need_Binding := All_Phases or Option_Bind_Only;
Data.Need_Linking := (All_Phases or Option_Link_Only)
-- project-based files (in which case we have a full Source_Id record).
No_Source_Info : constant Source_Info :=
- (Format_Gprbuild, null, null, False);
+ (Format_Gprbuild, null, null, False);
procedure Initialize
(Queue_Per_Obj_Dir : Boolean;
This attribute may be used to specify additional switches (last switches)
when linking a shared library.
+ It may also be used to add foreign object files in a static library.
+ Each string in Library_Options is an absolute or relative path of an object
+ file. When a relative path, it is relative to the object directory.
+
@item @b{Leading_Library_Options}:
@cindex @code{Leading_Library_Options}
This attribute, that is taken into account only by @command{gprbuild}, may be
directory. An aggregate library project has the same set of
restriction as a standard library project.
-Note that a shared aggregate library project cannot aggregates a
+Note that a shared aggregate library project cannot aggregate a
static library project. In platforms where a compiler option is
required to create relocatable object files, a Builder package in the
aggregate library project may be used:
elsif Is_Protected_Type (T) then
Set_Debug_Info_Needed_If_Not_Set (Corresponding_Record_Type (T));
+
+ elsif Is_Scalar_Type (T) then
+
+ -- If the subrange bounds are materialized by dedicated constant
+ -- objects, also include them to the debug info to make sure the
+ -- debugger can properly use them.
+
+ if Present (Scalar_Range (T))
+ and then Nkind (Scalar_Range (T)) = N_Range
+ then
+ declare
+ Low_Bnd : constant Node_Id := Type_Low_Bound (T);
+ High_Bnd : constant Node_Id := Type_High_Bound (T);
+
+ begin
+ if Is_Entity_Name (Low_Bnd) then
+ Set_Debug_Info_Needed_If_Not_Set (Entity (Low_Bnd));
+ end if;
+
+ if Is_Entity_Name (High_Bnd) then
+ Set_Debug_Info_Needed_If_Not_Set (Entity (High_Bnd));
+ end if;
+ end;
+ end if;
end if;
end if;
end Set_Debug_Info_Needed;