{"id":2223958,"url":"http://patchwork.ozlabs.org/api/patches/2223958/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/aeDVlLkXxFe9UM5l@tucnak/","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<aeDVlLkXxFe9UM5l@tucnak>","list_archive_url":null,"date":"2026-04-16T12:27:00","name":"c++: -Wkeyword-macro vs. contracts","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9acbc536cc961af66f607d34797250e02613e234","submitter":{"id":671,"url":"http://patchwork.ozlabs.org/api/people/671/?format=json","name":"Jakub Jelinek","email":"jakub@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/aeDVlLkXxFe9UM5l@tucnak/mbox/","series":[{"id":500151,"url":"http://patchwork.ozlabs.org/api/series/500151/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=500151","date":"2026-04-16T12:27:00","name":"c++: -Wkeyword-macro vs. contracts","version":1,"mbox":"http://patchwork.ozlabs.org/series/500151/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223958/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223958/checks/","tags":{},"related":[],"headers":{"Return-Path":"<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>","X-Original-To":["incoming@patchwork.ozlabs.org","gcc-patches@gcc.gnu.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","gcc-patches@gcc.gnu.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=ZnLpIHD1;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)","sourceware.org;\n\tdkim=pass (1024-bit key,\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=ZnLpIHD1","sourceware.org; dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","sourceware.org; spf=pass smtp.mailfrom=redhat.com","server2.sourceware.org;\n arc=none smtp.remote-ip=170.10.129.124"],"Received":["from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fxHMs1dyYz1yG9\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 16 Apr 2026 22:27:37 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id 206494BA23F7\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 16 Apr 2026 12:27:35 +0000 (GMT)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by sourceware.org (Postfix) with ESMTP id A86974BA23D8\n for <gcc-patches@gcc.gnu.org>; Thu, 16 Apr 2026 12:27:06 +0000 (GMT)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-Naoq4wM3PAK46UBzE4O_9A-1; Thu,\n 16 Apr 2026 08:27:04 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id DA2D018001FC\n for <gcc-patches@gcc.gnu.org>; Thu, 16 Apr 2026 12:27:03 +0000 (UTC)","from tucnak.zalov.cz (unknown [10.44.33.129])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with\n ESMTPS\n id 40EBB180044F; Thu, 16 Apr 2026 12:27:03 +0000 (UTC)","from tucnak.zalov.cz (localhost [127.0.0.1])\n by tucnak.zalov.cz (8.18.1/8.18.1) with ESMTPS id 63GCR0491012795\n (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT);\n Thu, 16 Apr 2026 14:27:00 +0200","(from jakub@localhost)\n by tucnak.zalov.cz (8.18.1/8.18.1/Submit) id 63GCR0QY1012794;\n Thu, 16 Apr 2026 14:27:00 +0200"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org 206494BA23F7","OpenDKIM Filter v2.11.0 sourceware.org A86974BA23D8"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org A86974BA23D8","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org A86974BA23D8","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776342426; cv=none;\n b=BhOyiycvbgFbsYpjKgFG/jq5XpW7Cvs90BDAIgL2uIL8CTUlUHGLYGB9eVZBDMAPWlQ84WwmRPu4mUXKO5IMxm/2AROMvsmvFs5t+cRAzWqX2nZ/tDaDKiembdWts8jR+tSarbctuS1qMkWsmJ1+xzEJPv0InsCysEXCbq5Cyzg=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776342426; c=relaxed/simple;\n bh=qzGZbnOXN5nSqEtD3YdCNsma+CTxWuYUTPYEXRWb0kE=;\n h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version;\n b=l82e9IUn6fmRrKllUDioGjzcqT2NVtGmDmP7iaUq2R2xt0WKDp1YBlBpPc9be1Tlxh5rGnvgWXQosC2xfkInWL4tHRjUg8OIXhGEh6OYs3Z7j2iGxbtBCwm0E6H99jH0Ko4q6WMfURvi41Y22+7lrhAPjEClr7nqB4Xava0M4hE=","ARC-Authentication-Results":"i=1; server2.sourceware.org","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776342426;\n h=from:from:reply-to:reply-to:subject:subject:date:date:\n message-id:message-id:to:to:cc:cc:mime-version:mime-version:\n content-type:content-type; bh=eVq61JrIqgQU09/EfiNqWsv/REjtzrJtkzmLjrxIltU=;\n b=ZnLpIHD1xXEO9vBDHULDNcvoEdwpxGBX8F5mv2gDeRmTe4Ox6IFhg1nZJuRkdQ1VD5cMdy\n wfwOk1T+e/4gPTsnxS0I0xWF1PX7PgygskFznUL/Ec6M6twFmR2CE5nkRNIBxKMYEsctFP\n uyi5Pcwh9Hwd1ubyZYkytXKoYSZd2Ys=","X-MC-Unique":"Naoq4wM3PAK46UBzE4O_9A-1","X-Mimecast-MFC-AGG-ID":"Naoq4wM3PAK46UBzE4O_9A_1776342424","Date":"Thu, 16 Apr 2026 14:27:00 +0200","From":"Jakub Jelinek <jakub@redhat.com>","To":"Jason Merrill <jason@redhat.com>","Cc":"gcc-patches@gcc.gnu.org","Subject":"[PATCH] c++: -Wkeyword-macro vs. contracts","Message-ID":"<aeDVlLkXxFe9UM5l@tucnak>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"N6UD9l80qwRK5AO21uN8YvnAORNzPC-CalVsEAMQXxQ_1776342424","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list <gcc-patches.gcc.gnu.org>","List-Unsubscribe":"<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>","List-Archive":"<https://gcc.gnu.org/pipermail/gcc-patches/>","List-Post":"<mailto:gcc-patches@gcc.gnu.org>","List-Help":"<mailto:gcc-patches-request@gcc.gnu.org?subject=help>","List-Subscribe":"<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>","Reply-To":"Jakub Jelinek <jakub@redhat.com>","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"Hi!\n\ncontract_assert is a keyword listed in c_common_reswords for D_CXX26,\nso no need to call cpp_warn separately on it, it is called already in\n            tree id = get_identifier (c_common_reswords[i].word);\n            if (IDENTIFIER_KEYWORD_P (id)\n                /* Don't register keywords with spaces.  */\n                && IDENTIFIER_POINTER (id)[IDENTIFIER_LENGTH (id) - 1] != ' ')\n              cpp_warn (parse_in, IDENTIFIER_POINTER (id),\n                        IDENTIFIER_LENGTH (id));\nearlier.  contract_assert is also the only -fcontracts related keyword in\nhttps://eel.is/c++draft/lex.key#tab:lex.key .  On the other side, pre/post\nare identifiers with special meaning: https://eel.is/c++draft/tab:lex.name.special\nand so need to be handled.  Note, contract_assert is also already correctly\ntested in those tests.\n\nTested on x86_64-linux, ok for trunk if this passes full bootstrap/regtest?\n\n2026-04-16  Jakub Jelinek  <jakub@redhat.com>\n\n\t* lex.cc (cxx_init): Don't call cpp_warn on contract_assert,\n\tinstead call it on pre and post.\n\n\t* g++.dg/warn/Wkeyword-macro-1.C: Expect error for pre/post for C++26.\n\t* g++.dg/warn/Wkeyword-macro-2.C: Expect warning for pre/post for\n\tC++26.\n\t* g++.dg/warn/Wkeyword-macro-4.C: Expect error for pre/post for C++26.\n\t* g++.dg/warn/Wkeyword-macro-5.C: Expect warning for pre/post for\n\tC++26.\n\t* g++.dg/warn/Wkeyword-macro-7.C: Likewise.\n\t* g++.dg/warn/Wkeyword-macro-8.C: Likewise.\n\n\n\tJakub","diff":"--- gcc/cp/lex.cc.jj\t2026-03-27 10:17:14.021332583 +0100\n+++ gcc/cp/lex.cc\t2026-04-16 13:55:47.995821223 +0200\n@@ -421,7 +421,10 @@ cxx_init (void)\n       if (cxx_dialect >= cxx26)\n \t{\n \t  if (flag_contracts)\n-\t    cpp_warn (parse_in, \"contract_assert\");\n+\t    {\n+\t      cpp_warn (parse_in, \"pre\");\n+\t      cpp_warn (parse_in, \"post\");\n+\t    }\n \t  cpp_warn (parse_in, \"indeterminate\");\n \t}\n     }\n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-1.C.jj\t2026-03-27 10:17:16.315295149 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-1.C\t2026-04-16 14:16:06.988539128 +0200\n@@ -93,8 +93,8 @@\n #define import 1\t\t\t// { dg-error \"keyword 'import' defined as macro\" \"\" { target c++26 } }\n #define module 1\t\t\t// { dg-error \"keyword 'module' defined as macro\" \"\" { target c++26 } }\n #define override 1\t\t\t// { dg-error \"keyword 'override' defined as macro\" \"\" { target c++26 } }\n-#define post 1\n-#define pre 1\n+#define post 1\t\t\t\t// { dg-error \"keyword 'post' defined as macro\" \"\" { target c++26 } }\n+#define pre 1\t\t\t\t// { dg-error \"keyword 'pre' defined as macro\" \"\" { target c++26 } }\n #define replaceable_if_eligible\n #define trivially_relocatable_if_eligible\n \n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-2.C.jj\t2026-03-27 10:17:16.315295149 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-2.C\t2026-04-16 14:16:10.653477920 +0200\n@@ -93,8 +93,8 @@\n #define import 1\t\t\t// { dg-warning \"keyword 'import' defined as macro\" \"\" { target c++26 } }\n #define module 1\t\t\t// { dg-warning \"keyword 'module' defined as macro\" \"\" { target c++26 } }\n #define override 1\t\t\t// { dg-warning \"keyword 'override' defined as macro\" \"\" { target c++26 } }\n-#define post 1\n-#define pre 1\n+#define post 1\t\t\t\t// { dg-warning \"keyword 'post' defined as macro\" \"\" { target c++26 } }\n+#define pre 1\t\t\t\t// { dg-warning \"keyword 'pre' defined as macro\" \"\" { target c++26 } }\n #define replaceable_if_eligible\n #define trivially_relocatable_if_eligible\n \n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-4.C.jj\t2026-03-27 10:17:16.316295133 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-4.C\t2026-04-16 14:16:17.027371472 +0200\n@@ -93,8 +93,8 @@\n #undef import \t\t\t\t// { dg-error \"undefining keyword 'import'\" \"\" { target c++26 } }\n #undef module \t\t\t\t// { dg-error \"undefining keyword 'module'\" \"\" { target c++26 } }\n #undef override \t\t\t// { dg-error \"undefining keyword 'override'\" \"\" { target c++26 } }\n-#undef post\n-#undef pre\n+#undef post\t \t\t\t// { dg-error \"undefining keyword 'post'\" \"\" { target c++26 } }\n+#undef pre\t \t\t\t// { dg-error \"undefining keyword 'pre'\" \"\" { target c++26 } }\n #undef replaceable_if_eligible\n #undef trivially_relocatable_if_eligible\n \n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-5.C.jj\t2026-03-27 10:17:16.316295133 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-5.C\t2026-04-16 14:16:20.106320051 +0200\n@@ -93,8 +93,8 @@\n #undef import \t\t\t\t// { dg-warning \"undefining keyword 'import'\" \"\" { target c++26 } }\n #undef module \t\t\t\t// { dg-warning \"undefining keyword 'module'\" \"\" { target c++26 } }\n #undef override \t\t\t// { dg-warning \"undefining keyword 'override'\" \"\" { target c++26 } }\n-#undef post\n-#undef pre\n+#undef post\t \t\t\t// { dg-warning \"undefining keyword 'post'\" \"\" { target c++26 } }\n+#undef pre\t \t\t\t// { dg-warning \"undefining keyword 'pre'\" \"\" { target c++26 } }\n #undef replaceable_if_eligible\n #undef trivially_relocatable_if_eligible\n \n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-7.C.jj\t2026-03-27 10:17:16.316295133 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-7.C\t2026-04-16 14:16:27.931189372 +0200\n@@ -3,7 +3,6 @@\n // { dg-do preprocess }\n // { dg-options \"-Wkeyword-macro\" }\n // { dg-additional-options \"-fmodules\" { target c++20 } }\n-// { dg-additional-options \"-fcontracts\" { target c++26 } }\n \n // [lex.key]\n #define alignas 1\t\t\t// { dg-warning \"keyword 'alignas' defined as macro\" \"\" { target c++11 } }\n@@ -94,8 +93,8 @@\n #define import 1\t\t\t// { dg-warning \"keyword 'import' defined as macro\" \"\" { target c++20 } }\n #define module 1\t\t\t// { dg-warning \"keyword 'module' defined as macro\" \"\" { target c++20 } }\n #define override 1\t\t\t// { dg-warning \"keyword 'override' defined as macro\" \"\" { target c++11 } }\n-#define post 1\n-#define pre 1\n+#define post 1\t\t\t\t// { dg-warning \"keyword 'post' defined as macro\" \"\" { target c++26 } }\n+#define pre 1\t\t\t\t// { dg-warning \"keyword 'pre' defined as macro\" \"\" { target c++26 } }\n #define replaceable_if_eligible\n #define trivially_relocatable_if_eligible\n \n--- gcc/testsuite/g++.dg/warn/Wkeyword-macro-8.C.jj\t2026-03-27 10:17:16.316295133 +0100\n+++ gcc/testsuite/g++.dg/warn/Wkeyword-macro-8.C\t2026-04-16 14:16:31.945122335 +0200\n@@ -3,7 +3,6 @@\n // { dg-do preprocess }\n // { dg-options \"-Wkeyword-macro\" }\n // { dg-additional-options \"-fmodules\" { target c++20 } }\n-// { dg-additional-options \"-fcontracts\" { target c++26 } }\n \n // [lex.key]\n #undef alignas\t\t\t\t// { dg-warning \"undefining keyword 'alignas'\" \"\" { target c++11 } }\n@@ -94,8 +93,8 @@\n #undef import\t\t\t\t// { dg-warning \"undefining keyword 'import'\" \"\" { target c++20 } }\n #undef module\t\t\t\t// { dg-warning \"undefining keyword 'module'\" \"\" { target c++20 } }\n #undef override\t\t\t\t// { dg-warning \"undefining keyword 'override'\" \"\" { target c++11 } }\n-#undef post\n-#undef pre\n+#undef post\t\t\t\t// { dg-warning \"undefining keyword 'post'\" \"\" { target c++26 } }\n+#undef pre\t\t\t\t// { dg-warning \"undefining keyword 'pre'\" \"\" { target c++26 } }\n #undef replaceable_if_eligible\n #undef trivially_relocatable_if_eligible\n \n","prefixes":[]}