From 618fff6043926c95657ae81f6ec93e1e9d3dc1bd Mon Sep 17 00:00:00 2001 From: Bob Duff Date: Thu, 8 Jul 2021 12:55:38 -0400 Subject: [PATCH] [Ada] Fix regression in ACATS bdd2006 and bdd2007 gcc/ada/ * sem_ch13.adb (Stream_Size): Print message about allowed stream sizes even if other error were already found. This avoids falling into the 'else', which prints "Stream_Size cannot be given for...", which is misleading -- the Size COULD be given if it were correct. --- gcc/ada/sem_ch13.adb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index b6face3136d2..228fd3999832 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -7824,12 +7824,17 @@ package body Sem_Ch13 is if Duplicate_Clause then null; - elsif Is_Elementary_Type (U_Ent) and then Present (Size) then - if Size /= System_Storage_Unit - and then Size /= System_Storage_Unit * 2 - and then Size /= System_Storage_Unit * 3 - and then Size /= System_Storage_Unit * 4 - and then Size /= System_Storage_Unit * 8 + elsif Is_Elementary_Type (U_Ent) then + -- Size will be empty if we already detected an error + -- (e.g. Expr is of the wrong type); we might as well + -- give the useful hint below even in that case. + + if No (Size) or else + (Size /= System_Storage_Unit + and then Size /= System_Storage_Unit * 2 + and then Size /= System_Storage_Unit * 3 + and then Size /= System_Storage_Unit * 4 + and then Size /= System_Storage_Unit * 8) then Error_Msg_N ("stream size for elementary type must be 8, 16, 24, " & -- 2.47.2