diff options
| -rw-r--r-- | gcc/ada/exp_ch7.adb | 29 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index ef3b5c9..f8c12b7 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -1575,19 +1575,10 @@ package body Exp_Ch7 is Prepend_To (Decls, Counter_Typ_Decl); -- The counter and its associated type must be manually analyzed - -- since N has already been analyzed. Use the scope of the spec - -- when inserting in a package. + -- since N has already been analyzed. - if For_Package then - Push_Scope (Spec_Id); - Analyze (Counter_Typ_Decl); - Analyze (Counter_Decl); - Pop_Scope; - - else - Analyze (Counter_Typ_Decl); - Analyze (Counter_Decl); - end if; + Analyze (Counter_Typ_Decl); + Analyze (Counter_Decl); Jump_Alts := New_List; end if; @@ -1933,12 +1924,8 @@ package body Exp_Ch7 is Append_To (Decls, Fin_Body); end if; - -- Push the name of the package - - Push_Scope (Spec_Id); Analyze (Fin_Spec); Analyze (Fin_Body); - Pop_Scope; -- Non-package case @@ -3419,6 +3406,10 @@ package body Exp_Ch7 is -- Step 2: Object [pre]processing if For_Package then + -- For package specs and bodies, we are invoked from the Standard + -- scope, so we need to push the specs onto the scope stack first. + + Push_Scope (Spec_Id); -- Preprocess the visible declarations now in order to obtain the -- correct number of controlled object by the time the private @@ -3496,6 +3487,12 @@ package body Exp_Ch7 is if Acts_As_Clean or Has_Ctrl_Objs or Has_Tagged_Types then Create_Finalizer; end if; + + -- Pop the scope that was pushed above for package specs and bodies + + if For_Package then + Pop_Scope; + end if; end Build_Finalizer; -------------------------- diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 5fff881..1fbbe6d 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -2908,7 +2908,7 @@ package body Inline is else Push_Scope (Scop); Expand_Cleanup_Actions (Decl); - End_Scope; + Pop_Scope; end if; Next_Elmt (Elmt); |