From c7959e489dd324fb6c4266c01c2dd6afd1fabb34 Mon Sep 17 00:00:00 2001
From: Justin Squirek <squirek@adacore.com>
Date: Fri, 7 May 2021 12:26:09 -0400
Subject: [PATCH] [Ada] Return when not working for procedures

gcc/ada/

	* par-ch6.adb (Get_Return_Kind): Properly handle the case of a
	"return when" statement in the procedure case.
---
 gcc/ada/par-ch6.adb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb
index 45a421420cbb..23371756baff 100644
--- a/gcc/ada/par-ch6.adb
+++ b/gcc/ada/par-ch6.adb
@@ -1903,6 +1903,11 @@ package body Ch6 is
             end if;
 
             Restore_Scan_State (Scan_State); -- to identifier
+
+         elsif Token = Tok_When then
+            Error_Msg_GNAT_Extension ("return when statement");
+
+            Result := Return_When;
          end if;
 
          return Result;
-- 
2.47.2