ada: Improve retrieval of nominal unconstrained type in extended return

When extended return statement declares object using an explicit subtype
indication, then it is better to recover the original unconstrained type using
the explicit subtype indication. This appears to be necessary for subtypes with
predicates.

gcc/ada/ChangeLog:

	* sem_ch3.adb (Check_Return_Subtype_Indication): Use type from
	explicit subtype indication, when possible.

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 98a8fa563919798cd4512f986fa1fc59b78636c2..f25941d72a8379a22816f155fbd78c59bbd58eee 100644 (file)
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -4204,7 +4204,11 @@ package body Sem_Ch3 is
          --  to recover the nominal unconstrained type.
 
          if Is_Constr_Subt_For_U_Nominal (Obj_Typ) then
-            Obj_Typ := Etype (Obj_Typ);
+            if Nkind (Object_Definition (Obj_Decl)) = N_Subtype_Indication then
+               Obj_Typ := Entity (Subtype_Mark (Object_Definition (Obj_Decl)));
+            else
+               Obj_Typ := Etype (Obj_Typ);
+            end if;
             pragma Assert (not Is_Constrained (Obj_Typ));
          end if;