From 5ab656c5e90219ce2d11a9c88d06ff927b275297 Mon Sep 17 00:00:00 2001 From: Etienne Servais Date: Tue, 15 Feb 2022 17:59:10 +0100 Subject: [PATCH] [Ada] Enhance the warning on C enum with size clause for size /= 32 Improve the warning message and silence warning when size > 32, this is likely intentional and does not warrant a warning. gcc/ada/ * freeze.adb (Freeze_Enumeration_Type): Fix comment, enhance message and silence warning for size > 32. --- gcc/ada/freeze.adb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 381468a..b75f9ef 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -7968,15 +7968,17 @@ package body Freeze is else -- If the enumeration type interfaces to C, and it has a size clause - -- that specifies less than int size, it warrants a warning. The - -- user may intend the C type to be an enum or a char, so this is + -- that is smaller than the size of int, it warrants a warning. The + -- user may intend the C type to be a boolean or a char, so this is -- not by itself an error that the Ada compiler can detect, but it - -- it is a worth a heads-up. For Boolean and Character types we + -- is worth a heads-up. For Boolean and Character types we -- assume that the programmer has the proper C type in mind. + -- For explicit sizes larger than int, assume the user knows what + -- he is doing and that the code is intentional. if Convention (Typ) = Convention_C and then Has_Size_Clause (Typ) - and then Esize (Typ) /= Esize (Standard_Integer) + and then Esize (Typ) < Standard_Integer_Size and then not Is_Boolean_Type (Typ) and then not Is_Character_Type (Typ) @@ -7985,7 +7987,12 @@ package body Freeze is and then not Target_Short_Enums then Error_Msg_N - ("C enum types have the size of a C int??", Size_Clause (Typ)); + ("??the size of enums in C is implementation-defined", + Size_Clause (Typ)); + Error_Msg_N + ("\??check that the C counterpart has size of " & + UI_Image (Esize (Typ)), + Size_Clause (Typ)); end if; Adjust_Esize_For_Alignment (Typ); -- 2.7.4