diff options
author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-04-25 12:10:58 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-04-25 12:10:58 +0200 |
commit | 99a71c65ab06b6f960b80fd02879c003701eab41 (patch) | |
tree | a92ff2d292c0515852b47744bcaf3b740c139a9d /gcc/ada | |
parent | 09a078a19d3159edcc0e08138721677e219803ac (diff) | |
download | gcc-99a71c65ab06b6f960b80fd02879c003701eab41.zip gcc-99a71c65ab06b6f960b80fd02879c003701eab41.tar.gz gcc-99a71c65ab06b6f960b80fd02879c003701eab41.tar.bz2 |
[multiple changes]
2013-04-25 Hristian Kirtchev <kirtchev@adacore.com>
* einfo.adb (Is_Ghost_Subprogram): Remove useless code.
2013-04-25 Robert Dewar <dewar@adacore.com>
* gnat_rm.texi: Minor addition of index entry.
2013-04-25 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch6.adb (Check_Access_Invariants): Test whether an
invariant procedure is empty before generating a call to it.
(Has_Enabled_Predicate): New routine.
(Has_Null_Body): New routine.
(Process_PPCs): Test whether an invariant procedure is
empty before generating a call to it. Test whether predicates are
enabled for a particular type before generating a predicate call.
* sem_util.ads, sem_util.adb (Find_Pragma): New routine.
From-SVN: r198282
Diffstat (limited to 'gcc/ada')
-rw-r--r-- | gcc/ada/ChangeLog | 19 | ||||
-rw-r--r-- | gcc/ada/einfo.adb | 18 | ||||
-rw-r--r-- | gcc/ada/gnat_rm.texi | 1 | ||||
-rw-r--r-- | gcc/ada/sem_ch6.adb | 110 | ||||
-rw-r--r-- | gcc/ada/sem_util.adb | 20 | ||||
-rw-r--r-- | gcc/ada/sem_util.ads | 5 |
6 files changed, 151 insertions, 22 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fe5113a..3d60a92 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,22 @@ +2013-04-25 Hristian Kirtchev <kirtchev@adacore.com> + + * einfo.adb (Is_Ghost_Subprogram): Remove useless code. + +2013-04-25 Robert Dewar <dewar@adacore.com> + + * gnat_rm.texi: Minor addition of index entry. + +2013-04-25 Hristian Kirtchev <kirtchev@adacore.com> + + * sem_ch6.adb (Check_Access_Invariants): Test whether an + invariant procedure is empty before generating a call to it. + (Has_Enabled_Predicate): New routine. + (Has_Null_Body): New routine. + (Process_PPCs): Test whether an invariant procedure is + empty before generating a call to it. Test whether predicates are + enabled for a particular type before generating a predicate call. + * sem_util.ads, sem_util.adb (Find_Pragma): New routine. + 2013-04-25 Robert Dewar <dewar@adacore.com> * sem_ch7.adb, einfo.adb, repinfo.adb, snames.adb-tmpl, diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb index 0381548b..7092ee7 100644 --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -6592,22 +6592,12 @@ package body Einfo is ------------------------- function Is_Ghost_Subprogram (Id : E) return B is - Subp_Id : Entity_Id := Id; - begin - if Present (Subp_Id) - and then Ekind_In (Subp_Id, E_Function, E_Procedure) - then - -- Handle subprogram renamings - - if Present (Alias (Subp_Id)) then - Subp_Id := Alias (Subp_Id); - end if; - - return Convention (Subp_Id) = Convention_Ghost; + if Present (Id) and then Ekind_In (Id, E_Function, E_Procedure) then + return Convention (Id) = Convention_Ghost; + else + return False; end if; - - return False; end Is_Ghost_Subprogram; -------------------- diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index 05e938f..4e228b1 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -6043,6 +6043,7 @@ postcondition of the subprogram should be ignored for this test case. @findex Thread_Local_Storage @cindex Task specific storage @cindex TLS (Thread Local Storage) +@cindex Task_Attributes Syntax: @smallexample @c ada diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 2ca1310..4b13429 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -11241,6 +11241,14 @@ package body Sem_Ch6 is -- references to parameters of the inherited subprogram to point to the -- corresponding parameters of the current subprogram. + function Has_Checked_Predicate (Typ : Entity_Id) return Boolean; + -- Determine whether type Typ has or inherits at least one predicate + -- aspect or pragma, for which the applicable policy is Checked. + + function Has_Null_Body (Proc_Id : Entity_Id) return Boolean; + -- Determine whether the body of procedure Proc_Id contains a sole null + -- statement, possibly followed by an optional return. + procedure Insert_After_Last_Declaration (Nod : Node_Id); -- Insert node Nod after the last declaration of the context @@ -11294,6 +11302,7 @@ package body Sem_Ch6 is if Has_Invariants (Typ) and then Present (Invariant_Procedure (Typ)) + and then not Has_Null_Body (Invariant_Procedure (Typ)) and then Is_Public_Subprogram_For (Typ) then Obj := @@ -11886,6 +11895,91 @@ package body Sem_Ch6 is return CP; end Grab_PPC; + --------------------------- + -- Has_Checked_Predicate -- + --------------------------- + + function Has_Checked_Predicate (Typ : Entity_Id) return Boolean is + Anc : Entity_Id; + Pred : Node_Id; + + begin + -- Climb the ancestor type chain staring from the input. This is done + -- because the input type may lack aspect/pragma predicate and simply + -- inherit those from its ancestor. + + Anc := Typ; + while Present (Anc) loop + Pred := Find_Pragma (Anc, Name_Predicate); + + if Present (Pred) and then not Is_Ignored (Pred) then + return True; + end if; + + Anc := Nearest_Ancestor (Anc); + end loop; + + return False; + end Has_Checked_Predicate; + + ------------------- + -- Has_Null_Body -- + ------------------- + + function Has_Null_Body (Proc_Id : Entity_Id) return Boolean is + Body_Id : Entity_Id; + Decl : Node_Id; + Spec : Node_Id; + Stmt1 : Node_Id; + Stmt2 : Node_Id; + + begin + Spec := Parent (Proc_Id); + Decl := Parent (Spec); + + -- Retrieve the entity of the invariant procedure body + + if Nkind (Spec) = N_Procedure_Specification + and then Nkind (Decl) = N_Subprogram_Declaration + then + Body_Id := Corresponding_Body (Decl); + + -- The body acts as a spec + + else + Body_Id := Proc_Id; + end if; + + -- The body will be generated later + + if No (Body_Id) then + return False; + end if; + + Spec := Parent (Body_Id); + Decl := Parent (Spec); + + pragma Assert + (Nkind (Spec) = N_Procedure_Specification + and then Nkind (Decl) = N_Subprogram_Body); + + Stmt1 := First (Statements (Handled_Statement_Sequence (Decl))); + + -- Look for a null statement followed by an optional return statement + + if Nkind (Stmt1) = N_Null_Statement then + Stmt2 := Next (Stmt1); + + if Present (Stmt2) then + return Nkind (Stmt2) = N_Simple_Return_Statement; + else + return True; + end if; + end if; + + return False; + end Has_Null_Body; + ----------------------------------- -- Insert_After_Last_Declaration -- ----------------------------------- @@ -12262,11 +12356,7 @@ package body Sem_Ch6 is -- Add an invariant call to check the result of a function - if Ekind (Designator) /= E_Procedure - and then Expander_Active - -- Check of Assertions_Enabled is certainly wrong ??? - and then Assertions_Enabled - then + if Ekind (Designator) /= E_Procedure and then Expander_Active then Func_Typ := Etype (Designator); Result := Make_Defining_Identifier (Loc, Name_uResult); @@ -12285,6 +12375,7 @@ package body Sem_Ch6 is if Has_Invariants (Func_Typ) and then Present (Invariant_Procedure (Func_Typ)) + and then not Has_Null_Body (Invariant_Procedure (Func_Typ)) and then Is_Public_Subprogram_For (Func_Typ) then Append_Enabled_Item @@ -12305,8 +12396,7 @@ package body Sem_Ch6 is -- this is done for functions as well, since in Ada 2012 they can have -- IN OUT args. - if Expander_Active and then Assertions_Enabled then - -- Check of Assertions_Enabled is certainly wrong ??? + if Expander_Active then Formal := First_Formal (Designator); while Present (Formal) loop if Ekind (Formal) /= E_In_Parameter @@ -12316,6 +12406,7 @@ package body Sem_Ch6 is if Has_Invariants (Formal_Typ) and then Present (Invariant_Procedure (Formal_Typ)) + and then not Has_Null_Body (Invariant_Procedure (Formal_Typ)) and then Is_Public_Subprogram_For (Formal_Typ) then Append_Enabled_Item @@ -12325,7 +12416,10 @@ package body Sem_Ch6 is Check_Access_Invariants (Formal); - if Present (Predicate_Function (Formal_Typ)) then + if Has_Predicates (Formal_Typ) + and then Present (Predicate_Function (Formal_Typ)) + and then Has_Checked_Predicate (Formal_Typ) + then Append_Enabled_Item (Make_Predicate_Check (Formal_Typ, New_Occurrence_Of (Formal, Loc)), diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 095510e..f55f594 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -4882,6 +4882,26 @@ package body Sem_Util is end if; end Find_Parameter_Type; + ----------------- + -- Find_Pragma -- + ----------------- + + function Find_Pragma (Id : Entity_Id; Name : Name_Id) return Node_Id is + Item : Node_Id; + + begin + Item := First_Rep_Item (Id); + while Present (Item) loop + if Nkind (Item) = N_Pragma and then Pragma_Name (Item) = Name then + return Item; + end if; + + Item := Next_Rep_Item (Item); + end loop; + + return Empty; + end Find_Pragma; + ----------------------------- -- Find_Static_Alternative -- ----------------------------- diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index fa5b6e3..11b7a91 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -494,6 +494,11 @@ package Sem_Util is -- Return the type of formal parameter Param as determined by its -- specification. + function Find_Pragma (Id : Entity_Id; Name : Name_Id) return Node_Id; + -- Given entity Id and pragma name Name, attempt to find the corresponding + -- pragma in Id's chain of representation items. The function returns Empty + -- if no such pragma has been found. + function Find_Static_Alternative (N : Node_Id) return Node_Id; -- N is a case statement whose expression is a compile-time value. -- Determine the alternative chosen, so that the code of non-selected |