[Ada] Do not expect task discriminants in Global and Depends contracts

2020-06-15  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_prag.adb (Analyze_Depends_In_Decl_Part,
	Analyze_Global_In_Decl_Part): Do not install task discriminants
	for analysis of the Global/Depends contracts.

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 2b63617..a32bb9b 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -2001,9 +2001,7 @@ package body Sem_Prag is
                Push_Scope (Spec_Id);
 
                if Ekind (Spec_Id) = E_Task_Type then
-                  if Has_Discriminants (Spec_Id) then
-                     Install_Discriminants (Spec_Id);
-                  end if;
+                  null;
 
                elsif Is_Generic_Subprogram (Spec_Id) then
                   Install_Generic_Formals (Spec_Id);
@@ -2791,9 +2789,7 @@ package body Sem_Prag is
             Push_Scope (Spec_Id);
 
             if Ekind (Spec_Id) = E_Task_Type then
-               if Has_Discriminants (Spec_Id) then
-                  Install_Discriminants (Spec_Id);
-               end if;
+               null;
 
             elsif Is_Generic_Subprogram (Spec_Id) then
                Install_Generic_Formals (Spec_Id);