{"id":2227380,"url":"http://patchwork.ozlabs.org/api/patches/2227380/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/patch/20260423141614.3451950-1-jason@redhat.com/","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":"<20260423141614.3451950-1-jason@redhat.com>","list_archive_url":null,"date":"2026-04-23T14:15:54","name":"[pushed] c++: fix typo in consteval, array, modules [PR124973]","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"721f0a3c245efde2c8b55baab8c9af519493a9bf","submitter":{"id":4337,"url":"http://patchwork.ozlabs.org/api/people/4337/?format=json","name":"Jason Merrill","email":"jason@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/20260423141614.3451950-1-jason@redhat.com/mbox/","series":[{"id":501204,"url":"http://patchwork.ozlabs.org/api/series/501204/?format=json","web_url":"http://patchwork.ozlabs.org/project/gcc/list/?series=501204","date":"2026-04-23T14:15:54","name":"[pushed] c++: fix typo in consteval, array, modules [PR124973]","version":1,"mbox":"http://patchwork.ozlabs.org/series/501204/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227380/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227380/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=W6KMTsmM;\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=W6KMTsmM","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.133.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 4g1dSl5QL4z1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 24 Apr 2026 00:16:55 +1000 (AEST)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id BE8B34BC0C05\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 14:16:53 +0000 (GMT)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by sourceware.org (Postfix) with ESMTP id 0B9F04BC0C04\n for <gcc-patches@gcc.gnu.org>; Thu, 23 Apr 2026 14:16:28 +0000 (GMT)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-qnvtqcA_MRWs1bljpIzy8A-1; Thu,\n 23 Apr 2026 10:16:26 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 44389195FD30\n for <gcc-patches@gcc.gnu.org>; Thu, 23 Apr 2026 14:16:16 +0000 (UTC)","from jason-thinkpadp1gen4i.rmtusma.csb (unknown [10.22.65.102])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id CAAF9196B8FC\n for <gcc-patches@gcc.gnu.org>; Thu, 23 Apr 2026 14:16:15 +0000 (UTC)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org BE8B34BC0C05","OpenDKIM Filter v2.11.0 sourceware.org 0B9F04BC0C04"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org 0B9F04BC0C04","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org 0B9F04BC0C04","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776953788; cv=none;\n b=pD6yIs9BfWa495x2fMCEcou9zMAcPvmgWAe5A1V/MlMRfCZne6VfpC2MQSYCv25JiJF4A950EG2DE5xdifVI6jgW+jJLyLGZ4PJCyZgVD4xi2j3JrOvYrH5J2DaXhIDtlC3rtRirW5llyhiZ46JYtvS8Y16x7AIgMbe4PS7xvjU=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776953788; c=relaxed/simple;\n bh=F16ZOdN2+XUHQRHDhvyou86dDBhac31aEdRyZPpzTQs=;\n h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;\n b=GF1ectsi757r7aw4WpzrTIovnboQcl5thjRnmcwRN3N/92HrZyr6RH0E5HbGpp+ZGtuBj8o5mIAehyrwBQCQ1Fm+QyUvGgKwdXR+QDv9qiEbyFOsAtrlkox1LZDaIfxCcKLXfMYNQYRywGlc/+1hObtQmoRFDLmkP80M64M9iRU=","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=1776953787;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=AvYay8dJcJ6QNj5IGzsobOaZwtnEEL4GIbeLszFsayY=;\n b=W6KMTsmM7Kziznarm+sH36GdUx3mvbOUitBcYNcBKU2DsnT8hgED+kvhy+zwYDDKebkcFl\n 4pu7yH4/j7qnXmOu+bfWkKAKV0H2QWOVxcHZdO/90w9DU7D/emtep18SkzegM7UgNN3jwF\n uVPpRsxogE2MqpB2L+sB2M471BFvvuw=","X-MC-Unique":"qnvtqcA_MRWs1bljpIzy8A-1","X-Mimecast-MFC-AGG-ID":"qnvtqcA_MRWs1bljpIzy8A_1776953785","From":"Jason Merrill <jason@redhat.com>","To":"gcc-patches@gcc.gnu.org","Subject":"[pushed] c++: fix typo in consteval, array, modules [PR124973]","Date":"Thu, 23 Apr 2026 10:15:54 -0400","Message-ID":"<20260423141614.3451950-1-jason@redhat.com>","In-Reply-To":"<9df0f39e-25cc-f9cf-22e8-718db7073df8@idea>","References":"<9df0f39e-25cc-f9cf-22e8-718db7073df8@idea>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"OAFTpyKnDApZaQdtszNLpO1g9TEvVfL7gcPFgdaX6_k_1776953785","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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>","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"Tested x86_64-pc-linux-gnu, applying to trunk and 16.\n\n-- 8< --\n\nArgh, I must have typoed when I realized that we wanted to check\nff_genericize here rather than !ff_only_non_odr.  And didn't notice the\nproblem because I also forgot the -O in the testcase.\n\n\tPR c++/124973\n\ngcc/cp/ChangeLog:\n\n\t* cp-gimplify.cc (cp_fold_r): Fix typo.\n\ngcc/testsuite/ChangeLog:\n\n\t* g++.dg/modules/consteval-1_b.C: Add -O.\n---\n gcc/cp/cp-gimplify.cc                        | 2 +-\n gcc/testsuite/g++.dg/modules/consteval-1_b.C | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\n\nbase-commit: 49ff5bcc944b65f8f637d541868de6af1f1480fe","diff":"diff --git a/gcc/cp/cp-gimplify.cc b/gcc/cp/cp-gimplify.cc\nindex 8ae66405817..85a3e98100f 100644\n--- a/gcc/cp/cp-gimplify.cc\n+++ b/gcc/cp/cp-gimplify.cc\n@@ -1718,7 +1718,7 @@ cp_fold_r (tree *stmt_p, int *walk_subtrees, void *data_)\n \n     case TARGET_EXPR:\n       if (!flag_no_inline\n-\t  && (data->flags && ff_genericize))\n+\t  && (data->flags & ff_genericize))\n \tif (tree &init = TARGET_EXPR_INITIAL (stmt))\n \t  {\n \t    tree folded = maybe_constant_init (init, TARGET_EXPR_SLOT (stmt),\ndiff --git a/gcc/testsuite/g++.dg/modules/consteval-1_b.C b/gcc/testsuite/g++.dg/modules/consteval-1_b.C\nindex 14676e5dcea..7d14cc4f625 100644\n--- a/gcc/testsuite/g++.dg/modules/consteval-1_b.C\n+++ b/gcc/testsuite/g++.dg/modules/consteval-1_b.C\n@@ -1,6 +1,6 @@\n // PR c++/124973\n // { dg-do compile { target c++20 } }\n-// { dg-additional-options \"-fmodules\" }\n+// { dg-additional-options \"-fmodules -O\" }\n \n export module left;\t\t// { dg-module-cmi left }\n import right;\n","prefixes":["pushed"]}