From patchwork Wed Oct 25 16:03:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 158176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp2763670rwb; Wed, 25 Oct 2023 09:04:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5ULufwQe5IhUW48YBqow+qOgjS2F+ahJq6IYHMJdYBODJJQhypQ6KEbj1r21KtjQZ3U2A X-Received: by 2002:a05:6214:554a:b0:66d:870:771e with SMTP id mc10-20020a056214554a00b0066d0870771emr195717qvb.13.1698249878545; Wed, 25 Oct 2023 09:04:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698249878; cv=pass; d=google.com; s=arc-20160816; b=DEyNwrrHWdj+RJsSyezi2JuQSsnInFwAdtPFE0IsBmHXEOkrYKkD0NHq16SeV39gQI i2S987ZrP9oHJVxVnIyr5CNuPMsF/6Cd38tXrmwE6/AefoF3ls3fVy+W6yjn4GE6ee2F tPURvNzQG1EcFHXjBzDlBhLDYzO4/oPABUAnfe159AyerQIzi0JaJxSHrWpTzA9ADwIJ NHSF4U5qpyXkNjZcSsllw+mXtLvU9E1bMj46Lu7Oa01u0kOlotOu2adOjGhGeOpgf50G Om1NBAgOFxbju8vymSZ4BVAF15njeDXUBBDO1od+UTgespNiyP68w0S26B3NK9N4e52c JQEg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=b1sy+aft9HV7gV8wMM0wtLartvYop3NYvTF63N60rng=; fh=1Hi9m88IqcWZGtfSxUrMGG+GBgL26N02X1SANXM6iTs=; b=RX47zYPyvawyjm+wblYuH4ryaxb/bo9d6/InwBgBIgc0by2Cx7iqNzFc6VggZ/HkpT Rj6L6SfSWfVgMzyHXeMMF2GXkuGAhPnj1y4l7sDqyMtiBaIww05UwyjKAQarX7Xcpurf bxOIMnyj44TxtX5I57T5MBmbLDEYlQC8O9RaplwkMQAM3N79xFgxinGG5TzoQMmAinvl lICGIn/a3q0vvPEXcmVInowP8QN5EVCGWFt9/B68gts6FQM0xLmEBcv3QKkR2MMTf7Fi hYx7S73DGi9WmcRvjWVKxRdBJmNXl3RetaOKJ9PTBJQ+HDH90wA74izronV0b0KuOEtn HuLw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eHqmSxUj; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a4-20020a0cb344000000b0066cf62213d8si8784110qvf.58.2023.10.25.09.04.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 09:04:38 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=eHqmSxUj; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5B374385841B for ; Wed, 25 Oct 2023 16:04:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 6D6E8385841B for ; Wed, 25 Oct 2023 16:04:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D6E8385841B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6D6E8385841B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698249853; cv=none; b=xd/q8pZDD1WG2WSGYtkHmu7o6ZbTC6QVeuyB/Vv3SRIHDbKo5KYPWd2bduOeJw7W4z8fJs1nXNOzI9gClacohoJn4kAEDJvq2v2Z/IERySFj4lVIojkbdhwAGMbNODlRVlKzuDuIehtJlfBUDvy/CqvGRDujpFaRYgJkIugK6S4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698249853; c=relaxed/simple; bh=K4SvzsEIWpv5Jn6LHWPbsQtV34ySdmC0SkR6HYnsNtc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ioGIMkleAaiDYEjpBOQoa3rtfxDMcTI2CTWyTzda+xW4jrydV0q4rsqaH7+84wIwfr1gzk3muv0xVQYEaAXTWw7Cq8W9i1ENszx/yaYCdPxlJC/MrDlr+PHkgxEnXWYt55AuT4crsUQynj+z6RxlJFHbLhoa2td8GyAinUxa2HY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698249852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b1sy+aft9HV7gV8wMM0wtLartvYop3NYvTF63N60rng=; b=eHqmSxUjQMFSTc9tM7xzVPYc+QB+juuvEmKNxTq7B6UDKdU7Df/zyFuCsmWRKf9PZmE30u ClXWWnBDNUstYFl+Y3v/W9ppczlDPMR0wVjCBI/BD9rXyWz6l+W4BzJVrDLcXPwS9vRbTq Lt4c/dz1sUm/w/9LIu9+M9LnJjx/JpQ= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-539-PTQypGO4MCanK3AktyDmZA-1; Wed, 25 Oct 2023 12:04:10 -0400 X-MC-Unique: PTQypGO4MCanK3AktyDmZA-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-41cdc2cc0b4so15805311cf.0 for ; Wed, 25 Oct 2023 09:04:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698249850; x=1698854650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=b1sy+aft9HV7gV8wMM0wtLartvYop3NYvTF63N60rng=; b=oj94ooZ5nTbFBmXlSGha6wPnvxQ2FoJf6XNi/2B+0A5kF7eRexnL0vuW4czKl/rjxO KU6jOrJhCzyVO93ZAkfEZAjH5IbB8V5H1dpb0hwemh/e9UTGuFJwu5rzrREQlG1u7Dru fNjRgsb5VmReqrBHZHxzePBH8PLBemXN8zmDgyWpC9uAxo3oIXQgZOfmangiLH/fnMzN 6MK6+LVrEc5aVZqYvVOlSd7kpZJdNErXiFDCNJvZWA5IYPmPaL8c0BfOnhcWOOq+kKnf y9gj/BZP7/9joQrF0c4rSh+G0wKH97xFOmfyVlyXEujRfq+v+dF6nRW+ONm8jzyN6K6d XH+w== X-Gm-Message-State: AOJu0Yz7qG5OuRuX2L3Cw62UkmXhFs7p+V0Nc8Q/oEOr4w8RI2NGZQgY Y36+seKhzmrXRLhUOISAPrRXWTpa3kfdT+JEWhJSnUF7wMPH70soDadfg6XRcVmKunffPhphwDL XuRdU+l5iijbkGCaQhlw0NYUMAaAbCzV65HkVUF3Ohc0JO1gIN4pqMJCkohWM7S78P9GDkEmTlN 0= X-Received: by 2002:ac8:5bc4:0:b0:417:b06f:6103 with SMTP id b4-20020ac85bc4000000b00417b06f6103mr39623qtb.21.1698249849549; Wed, 25 Oct 2023 09:04:09 -0700 (PDT) X-Received: by 2002:ac8:5bc4:0:b0:417:b06f:6103 with SMTP id b4-20020ac85bc4000000b00417b06f6103mr39589qtb.21.1698249849121; Wed, 25 Oct 2023 09:04:09 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id v14-20020ac8748e000000b0041815bcea29sm4308371qtq.19.2023.10.25.09.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 09:03:56 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: another build_new_1 folding fix [PR111929] Date: Wed, 25 Oct 2023 12:03:44 -0400 Message-ID: <20231025160345.358175-1-ppalka@redhat.com> X-Mailer: git-send-email 2.42.0.482.g2e8e77cbac MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780744064253296509 X-GMAIL-MSGID: 1780744064253296509 Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- We also need to avoid folding 'outer_nelts_check' when in a template context to prevent an ICE on the below testcase. This patch achieves this by replacing the fold_build2 call with build2 (cp_fully_fold will later fold the overall expression if appropriate). In passing, this patch removes an unnecessary call to convert on 'nelts' since it should always already be a size_t (and 'convert' isn't the best conversion entry point to use anyway since it doesn't take a complain parameter.) PR c++/111929 gcc/cp/ChangeLog: * init.cc (build_new_1): Remove unnecessary call to convert on 'nelts'. Use build2 instead of fold_build2 for 'outer_nelts_checks'. gcc/testsuite/ChangeLog: * g++.dg/template/non-dependent28a.C: New test. --- gcc/cp/init.cc | 8 ++++---- gcc/testsuite/g++.dg/template/non-dependent28a.C | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/non-dependent28a.C diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index 65d37c3c0c7..6444f0a8518 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -3261,7 +3261,7 @@ build_new_1 (vec **placement, tree type, tree nelts, max_outer_nelts = wi::udiv_trunc (max_size, inner_size); max_outer_nelts_tree = wide_int_to_tree (sizetype, max_outer_nelts); - size = build2 (MULT_EXPR, sizetype, size, convert (sizetype, nelts)); + size = build2 (MULT_EXPR, sizetype, size, nelts); if (TREE_CODE (cst_outer_nelts) == INTEGER_CST) { @@ -3293,9 +3293,9 @@ build_new_1 (vec **placement, tree type, tree nelts, - wi::clz (max_outer_nelts); max_outer_nelts = (max_outer_nelts >> shift) << shift; - outer_nelts_check = fold_build2 (LE_EXPR, boolean_type_node, - outer_nelts, - max_outer_nelts_tree); + outer_nelts_check = build2 (LE_EXPR, boolean_type_node, + outer_nelts, + max_outer_nelts_tree); } } diff --git a/gcc/testsuite/g++.dg/template/non-dependent28a.C b/gcc/testsuite/g++.dg/template/non-dependent28a.C new file mode 100644 index 00000000000..d32520c38ee --- /dev/null +++ b/gcc/testsuite/g++.dg/template/non-dependent28a.C @@ -0,0 +1,8 @@ +// PR c++/111929 + +struct A { operator int(); }; + +template +void f() { + new int[A()]; +}