From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 358C53858407; Tue, 17 May 2022 08:29:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 358C53858407 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-546] [Ada] Enhance the warning on C enum with size clause for size /= 32 X-Act-Checkin: gcc X-Git-Author: Etienne Servais X-Git-Refname: refs/heads/master X-Git-Oldrev: 3c802e974955085696b6ba3ca20bcde2e2c53921 X-Git-Newrev: 5ab656c5e90219ce2d11a9c88d06ff927b275297 Message-Id: <20220517082935.358C53858407@sourceware.org> Date: Tue, 17 May 2022 08:29:35 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2022 08:29:35 -0000 https://gcc.gnu.org/g:5ab656c5e90219ce2d11a9c88d06ff927b275297 commit r13-546-g5ab656c5e90219ce2d11a9c88d06ff927b275297 Author: Etienne Servais Date: Tue Feb 15 17:59:10 2022 +0100 [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. Diff: --- 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 381468aa687..b75f9ef07d5 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);