[Ada] Illegal selection of first object in a task type's body not detected
diff mbox series

Message ID 20190814095311.GA51842@adacore.com
State New
Headers show
Series
  • [Ada] Illegal selection of first object in a task type's body not detected
Related show

Commit Message

Pierre-Marie de Rodat Aug. 14, 2019, 9:53 a.m. UTC
The compiler was improperly allowing selection of an object declared
within a task body when the prefix was of the task type, specifically in
the case where the object was the very first declared in the body
(selections of later body declarations were being flagged).  The flag
Is_Private_Op was only set at the point of the first "private"
declaration of the type in cases where the first declaration's name
didn't match the selector.

Tested on x86_64-pc-linux-gnu, committed on trunk

2019-08-14  Gary Dismukes  <dismukes@adacore.com>

gcc/ada/

	* sem_ch4.adb (Analyze_Selected_Component): In the case where
	the prefix is of a concurrent type, and the selected entity
	matching the selector is the first private declaration of the
	type (such as the first local variable in a task's body), set
	Is_Private_Op.

gcc/testsuite/

	* gnat.dg/task5.adb: New testcase.

Patch
diff mbox series

--- gcc/ada/sem_ch4.adb
+++ gcc/ada/sem_ch4.adb
@@ -4994,7 +4994,15 @@  package body Sem_Ch4 is
                if Comp = First_Private_Entity (Type_To_Use) then
                   if Etype (Sel) /= Any_Type then
 
-                     --  We have a candiate
+                     --  If the first private entity's name matches, then treat
+                     --  it as a private op: needed for the error check for
+                     --  illegal selection of private entities further below.
+
+                     if Chars (Comp) = Chars (Sel) then
+                        Is_Private_Op := True;
+                     end if;
+
+                     --  We have a candidate, so exit the loop
 
                      exit;
 

--- /dev/null
new file mode 100644
+++ gcc/testsuite/gnat.dg/task5.adb
@@ -0,0 +1,26 @@ 
+procedure Task5 is
+
+   task type T is
+      entry E (V1, V2 : Integer);
+   end T;
+
+   T_Obj : T;
+
+   task body T is
+      V1 : Integer;
+      V2 : Integer;
+      V3 : Integer;
+   begin
+      accept E (V1, V2 : Integer) do
+         T.V1 := V1;
+         T.V2 := V2;
+
+         T_Obj.V1 := V1;  -- { dg-error "invalid reference to private operation of some object of type \"T\"" }
+         T_Obj.V2 := V2;  -- { dg-error "invalid reference to private operation of some object of type \"T\"" }
+         T_Obj.V3 := V3;  -- { dg-error "invalid reference to private operation of some object of type \"T\"" }
+      end E;
+   end T;
+
+begin
+   null;
+end Task5;