+2014-08-01 Hristian Kirtchev <kirtchev@adacore.com>
+
+ * einfo.adb (Is_Hidden_Non_Overridden_Subprogram): Remove the
+ assertion check as the attribute is defined for all entities.
+ (Set_Is_Hidden_Non_Overridden_Subprogram): Remove the assertion
+ check as the attribute is defined for all entities.
+ * einfo.ads Update the documentation of attribute
+ Is_Hidden_Non_Overridden_Subprogram.
+ * sem_ch7.adb (Install_Package_Entity): No need to check the
+ entity kind of the Id.
+ * sem_ch13.adb (Hide_Matching_Homograph): Update the comment on
+ usage. Ensure that the homographs are of the same entity kind
+ and not fully conformant.
+ (Hide_Non_Overridden_Subprograms): Update the comment on usage.
+
+2014-08-01 Robert Dewar <dewar@adacore.com>
+
+ * inline.adb: Minor code reorganization.
+ * sem_ch12.adb, s-tasdeb.ads: Minor reformatting.
+
2014-08-01 Robert Dewar <dewar@adacore.com>
* inline.adb, s-os_lib.ads: Minor reformatting.
function Is_Hidden_Non_Overridden_Subprogram (Id : E) return B is
begin
- pragma Assert (Ekind_In (Id, E_Function, E_Procedure));
return Flag2 (Id);
end Is_Hidden_Non_Overridden_Subprogram;
procedure Set_Is_Hidden_Non_Overridden_Subprogram (Id : E; V : B := True) is
begin
- pragma Assert (Ekind_In (Id, E_Function, E_Procedure));
Set_Flag2 (Id, V);
end Set_Is_Hidden_Non_Overridden_Subprogram;
-- Private_Declaration in sem_ch7).
-- Is_Hidden_Non_Overridden_Subprogram (Flag2)
--- Defined in all entities. Set for implicitly declared non-generic
--- subprograms that require overriding or are null procedures, and are
--- hidden by a non-conformant homograph with the same characteristics
+-- Defined in all entities. Set for implicitly declared subprograms
+-- that require overriding or are null procedures, and are hidden by
+-- a non-fully conformant homograph with the same characteristics
-- (Ada RM 8.3 12.3/2).
-- Is_Hidden_Open_Scope (Flag171)
and then Msg (Msg'First .. Msg'First + 12) = "cannot inline"
then
declare
- Len1 : constant Positive := 13;
- -- Length of "cannot inline"
-
- Len2 : constant Positive := 31;
- -- Length of "info: no contextual analysis of"
+ Len1 : constant Positive :=
+ String (String'("cannot inline"))'Length;
+ Len2 : constant Positive :=
+ String (String'("info: no contextual analysis of"))'Length;
New_Msg : String (1 .. Msg'Length + Len2 - Len1);
(Dependent : Task_Id;
Parent : Task_Id;
Master_Level : Integer);
- -- Indicate to Valgrind/Helgrind that the master of Dependent
- -- is Parent + Master_Level.
+ -- Indicate to Valgrind/Helgrind that the master of Dependent is
+ -- Parent + Master_Level.
procedure Master_Completed_Hook
(Self_ID : Task_Id;
Master_Level : Integer);
- -- Indicate to Valgrind/Helgrind that Self_ID has completed
- -- the master Master_Level.
+ -- Indicate to Valgrind/Helgrind that Self_ID has completed the master
+ -- Master_Level.
end System.Tasking.Debug;
Present
(Get_First_Parent_With_Ext_Axioms_For_Entity
(Defining_Entity (Analyzed_Formal)))
- and then Ekind (Defining_Entity (Analyzed_Formal))
- = E_Function
+ and then Ekind (Defining_Entity (Analyzed_Formal)) =
+ E_Function
then
-
-- If actual is an entity (function or operator),
-- build wrapper for it.
-- Ditto if formal is an operator with a default.
elsif Box_Present (Formal)
- and then Nkind (Defining_Entity (Analyzed_Formal))
- = N_Defining_Operator_Symbol
+ and then Nkind (Defining_Entity (Analyzed_Formal)) =
+ N_Defining_Operator_Symbol
then
Append_To (Assoc,
Build_Wrapper
procedure Freeze_Entity_Checks (N : Node_Id) is
procedure Hide_Non_Overridden_Subprograms (Typ : Entity_Id);
-- Inspect the primitive operations of type Typ and hide all pairs of
- -- implicitly declared non-overridden homographs (Ada RM 8.3 12.3/2).
+ -- implicitly declared non-overridden non-fully conformant homographs
+ -- (Ada RM 8.3 12.3/2).
-------------------------------------
-- Hide_Non_Overridden_Subprograms --
(Subp_Id : Entity_Id;
Start_Elmt : Elmt_Id);
-- Inspect a list of primitive operations starting with Start_Elmt
- -- and find matching implicitly declared non-overridden homographs
- -- of Subp_Id. If found, all matches along with Subp_Id are hidden
- -- from all visibility.
+ -- and find matching implicitly declared non-overridden non-fully
+ -- conformant homographs of Subp_Id. If found, all matches along
+ -- with Subp_Id are hidden from all visibility.
function Is_Non_Overridden_Or_Null_Procedure
(Subp_Id : Entity_Id) return Boolean;
Prim := Node (Prim_Elmt);
-- The current primitive is implicitly declared non-overridden
- -- homograph of Subp_Id. Hide both subprograms from visibility.
+ -- non-fully conformant homograph of Subp_Id. Both subprograms
+ -- must be hidden from visibility.
if Chars (Prim) = Chars (Subp_Id)
- and then Ekind (Prim) = Ekind (Subp_Id)
and then Is_Non_Overridden_Or_Null_Procedure (Prim)
+ and then not Fully_Conformant (Prim, Subp_Id)
then
Set_Is_Hidden_Non_Overridden_Subprogram (Prim);
Set_Is_Immediately_Visible (Prim, False);
-- Start of processing for Hide_Non_Overridden_Subprograms
begin
- -- Inspect the list of primitives looking for a non-overriding
- -- inherited null procedure.
+ -- Inspect the list of primitives looking for non-overridden
+ -- subprograms.
if Present (Prim_Ops) then
Prim_Elmt := First_Elmt (Prim_Ops);
-- abstract subprograms, null procedures and subprograms that require
-- overriding. If this set contains fully conformat homographs, then one
-- is chosen arbitrarily (already done during resolution), otherwise all
- -- remaining non-conformant homographs must be hidden from visibility
+ -- remaining non-fully conformant homographs are hidden from visibility
-- (Ada RM 8.3 12.3/2).
if Is_Tagged_Type (E) then
-- a tagged type back into visibility if they have non-conformant
-- homographs (Ada RM 8.3 12.3/2).
- elsif Ekind_In (Id, E_Function, E_Procedure)
- and then Is_Hidden_Non_Overridden_Subprogram (Id)
- then
+ elsif Is_Hidden_Non_Overridden_Subprogram (Id) then
null;
else
projects / gcc.git / commitdiff