diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/ada/einfo.ads | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_attr.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch6.adb | 22 | ||||
| -rw-r--r-- | gcc/ada/sem_ch8.adb | 4 |
5 files changed, 22 insertions, 18 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 20a79aa..f53f1d2 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,15 @@ 2009-04-10 Robert Dewar <dewar@adacore.com> + * sem_ch6.adb: Minor code clean up. + + * einfo.ads, sem_attr.adb: Minor comment fixes. + +2009-04-10 Robert Dewar <dewar@adacore.com> + + * sem_ch8.adb: Minor reformatting + +2009-04-10 Robert Dewar <dewar@adacore.com> + * einfo.ads, einfo.adb (Postcondition_Proc): New attribute for procedures. diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index d589a60..48d2e20 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -5145,7 +5145,7 @@ package Einfo is -- E_Procedure -- E_Generic_Procedure - -- Postcondition_Proc (Node8) + -- Postcondition_Proc (Node8) (non-generic case only) -- Renaming_Map (Uint9) -- Handler_Records (List10) (non-generic case only) -- Protected_Body_Subprogram (Node11) diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index 7758f4b..2bf6143 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -3827,7 +3827,7 @@ package body Sem_Attr is end if; -- Body case, where we must be inside a generated _Postcondition - -- procedure, and the prefix must be on the scope stack, or else + -- procedure, and the prefix must be on the scope stack, or else -- the attribute use is definitely misplaced. The condition itself -- may have generated transient scopes, and is not necessarily the -- current one. diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 5d43a14..fe09813 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -1869,9 +1869,11 @@ package body Sem_Ch6 is Check_Inline_Pragma (Spec_Id); - -- Case of fully private operation in the body of the protected type. - -- We must create a declaration for the subprogram, in order to attach - -- the protected subprogram that will be used in internal calls. + -- Deal with special case of a fully private operation in the body of + -- the protected type. We must create a declaration for the subprogram, + -- in order to attach the protected subprogram that will be used in + -- internal calls. We exclude compiler generated bodies from the + -- expander since the issue does not arise for those cases. if No (Spec_Id) and then Comes_From_Source (N) @@ -1932,10 +1934,11 @@ package body Sem_Ch6 is Set_Has_Completion (Spec_Id); Set_Convention (Spec_Id, Convention_Protected); end; + end if; - -- Case where a separate spec is present + -- If a sep[arate spec is present, then deal with freezing issues - elsif Present (Spec_Id) then + if Present (Spec_Id) then Spec_Decl := Unit_Declaration_Node (Spec_Id); Verify_Overriding_Indicator; @@ -1960,15 +1963,6 @@ package body Sem_Ch6 is Set_Has_Delayed_Freeze (Spec_Id); Insert_Actions (N, Freeze_Entity (Spec_Id, Loc)); end if; - - -- The missing else branch here is for the case where there is no - -- separate spec and either we don't have a protected operation, or the - -- node is compiler generated. Is it really right that nothing needs to - -- be done in this case. At the very least a comment is appropriate as - -- to why nothing needs to be done in this case ??? - - else - null; end if; -- Mark presence of postcondition proc in current scope diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 116b560..52f1855 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -449,8 +449,8 @@ package body Sem_Ch8 is -- private with on E. procedure Find_Expanded_Name (N : Node_Id); - -- Selected component is known to be expanded name. Verify legality - -- of selector given the scope denoted by prefix. + -- Selected component is known to be expanded name. Verify legality of + -- selector given the scope denoted by prefix. function Find_Renamed_Entity (N : Node_Id; |