aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/exp_ch7.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2010-10-18 11:46:31 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2010-10-18 11:46:31 +0200
commita780db15307e718218f39f753eebe20689fa1e30 (patch)
tree4540c03ab0e98dee1c3ccd724dbec7f679f61108 /gcc/ada/exp_ch7.adb
parentfda9c731a9a047cdde798207b896784e8233a4d8 (diff)
downloadgcc-a780db15307e718218f39f753eebe20689fa1e30.zip
gcc-a780db15307e718218f39f753eebe20689fa1e30.tar.gz
gcc-a780db15307e718218f39f753eebe20689fa1e30.tar.bz2
[multiple changes]
2010-10-18 Javier Miranda <miranda@adacore.com> * exp_util.adb (Side_Effect_Free): Code clean up. 2010-10-18 Ed Schonberg <schonberg@adacore.com> * sem_ch8.adb (Is_Primitive_Operator_In_Use): Renamed from Is_Primitive_Operator. When ending the scope of a use package scope, a primitive operator remains in use if the base type has a current use (type) clause. 2010-10-18 Javier Miranda <miranda@adacore.com> * einfo.ads (Is_Dynamic_Support): Add missing support for limited private types whose full-view is a task type. * sem_util.adb (Enclosing_Subprogram): Add missing support for limited private types whose full-view is a task type. * exp_ch7.adb (Find_Final_List): Minor code cleanup replacing code by function Nearest_Dynamic_Scope which provides the needed functionality. 2010-10-18 Arnaud Charlet <charlet@adacore.com> * sem_prag.adb (Set_Exported): Do not generate error when exporting a variable with an address clause in codepeer mode. From-SVN: r165614
Diffstat (limited to 'gcc/ada/exp_ch7.adb')
-rw-r--r--gcc/ada/exp_ch7.adb6
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 2b7d901..27f4b50 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -1739,11 +1739,7 @@ package body Exp_Ch7 is
end if;
else
- if Is_Dynamic_Scope (E) then
- S := E;
- else
- S := Enclosing_Dynamic_Scope (E);
- end if;
+ S := Nearest_Dynamic_Scope (E);
-- When the finalization chain entity is 'Error', it means that there
-- should not be any chain at that level and that the enclosing one