[Ada] Fix spurious error on checking of null Abstract_State

2020-05-25  Yannick Moy  <moy@adacore.com>

gcc/ada/

	* sem_util.adb (Check_No_Hidden_State): Stop propagation at
	first block/task/entry.

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7c8af5f8387b5d85d64d26c1f1a1aadf1641525d..4e1b34d2aec61c0deb0ce85b03862a681eb19daf 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-25  Yannick Moy  <moy@adacore.com>
+
+       * sem_util.adb (Check_No_Hidden_State): Stop propagation at
+       first block/task/entry.
+
 2020-05-25  Yannick Moy  <moy@adacore.com>
 
        * doc/gnat_rm/implementation_defined_pragmas.rst: Document

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index e1703e995f11d8bc31cd1fa02a1a484904e90118..b980b4c63fda27c398da434bb3c70bed93f990af 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -3387,10 +3387,14 @@ package body Sem_Util is
             return;
 
          --  Objects and states that appear immediately within a subprogram or
-         --  inside a construct nested within a subprogram do not introduce a
-         --  hidden state. They behave as local variable declarations.
+         --  entry inside a construct nested within a subprogram do not
+         --  introduce a hidden state. They behave as local variable
+         --  declarations. The same is true for elaboration code inside a block
+         --  or a task.
 
-         elsif Is_Subprogram (Context) then
+         elsif Is_Subprogram_Or_Entry (Context)
+           or else Ekind_In (Context, E_Block, E_Task_Type)
+         then
             return;
 
          --  When examining a package body, use the entity of the spec as it