From patchwork Thu Jun 17 03:38:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1493153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=QkjHufAI; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G578M2Fswz9sSs for ; Thu, 17 Jun 2021 13:39:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FD96383B436 for ; Thu, 17 Jun 2021 03:39:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FD96383B436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623901149; bh=XTQtHlw1dHPxuLu/PiDXTz92ViyOdMtWZRWB+G0kkH0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=QkjHufAI+mHzfUsMYcMnuous4hKGFenlMvpeP/mDD5/sF87CmeO3FOeUj/oL4agt1 0aaSqoBTCRloiqTqTPmJkIf57j/nlPmnk1O43MMI/Cz8TaA8xuXBen19o/BUe5cU1k 5pwr7A8QYCUWCEXCxIia4HTQNlZukfntgODa1118= 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.133.124]) by sourceware.org (Postfix) with ESMTP id 376AF385040E for ; Thu, 17 Jun 2021 03:38:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 376AF385040E Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-536-u4jHvUgPOtSikvs3nXbNoQ-1; Wed, 16 Jun 2021 23:38:23 -0400 X-MC-Unique: u4jHvUgPOtSikvs3nXbNoQ-1 Received: by mail-qt1-f200.google.com with SMTP id f13-20020ac85d0d0000b029024ba963cb08so2974253qtx.4 for ; Wed, 16 Jun 2021 20:38:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XTQtHlw1dHPxuLu/PiDXTz92ViyOdMtWZRWB+G0kkH0=; b=KJjCqiB2CLzopE5Jh0O5LvhTiitSy8EXu/J30nsQDhsnC1sqo3Tryx/xgCd2cmSFqE VErCjd5ZPPPcInuSAp+5AvuVKz1UpkdfkIh9jdagovbfPZVzB6hMwF+7VMDhdaDZ6LAi qtxUXvlfRofG1WwBuMyA1B8H6066mvpiQzNcFBifrIrdfMmFv9+N4BpqmAx+IAY9CLjS Qtj8WZMMWBAIcoBozzqFlGN0sb0hGBb3MI4IDw0BcBlxReHiMwPYzdAuJclmovD0+Dzx BdDgxW+mPqxsbxtDtGU7VjtbENFMPz4/Z2I0iOaSUMLvKoPhjDtNvu3lSRa8bJ2br+qV PbLw== X-Gm-Message-State: AOAM530UzyfWwN3KKRCsu4l3zZThEPOcuu2+1nWvlkZSx9p7yPGmgws2 X3fzrQ/Brl11tn2jEyGKxOAf9s0pnO/25rYwk6QVOHQdX2s6TfZ6qvscOuxqu6OWb0fQ1WrXBeT nXdVjJ4EXE5cs7JOemiYKvLtGrc0I1A8CJnz5mbnDpl+3bwsWyN/Z6KINiEFG4rkKqw== X-Received: by 2002:a05:6214:1021:: with SMTP id k1mr3745372qvr.4.1623901102958; Wed, 16 Jun 2021 20:38:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAbpdWkRahyTmHh7InIZioDcijxzAhDOCDeXrRHaO7TMvWOeMEIUng8pOrmZtiaE/z8gB06g== X-Received: by 2002:a05:6214:1021:: with SMTP id k1mr3745351qvr.4.1623901102639; Wed, 16 Jun 2021 20:38:22 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s11817.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id f193sm895625qke.43.2021.06.16.20.38.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 20:38:21 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: Tweak PR101029 fix Date: Wed, 16 Jun 2021 23:38:20 -0400 Message-Id: <20210617033820.2260636-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210612164040.1615596-1-jason@redhat.com> References: <20210612164040.1615596-1-jason@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The case of an initializer with side effects for a zero-length array seems extremely unlikely, but we should still return the right type in that case. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/101029 gcc/cp/ChangeLog: * init.c (build_vec_init): Preserve the type of base. --- gcc/cp/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 6816a44dfe1b5fa9414490a18a4aa723b6f38f18 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 622d6e9d0c5..4bd942f3f74 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -4226,7 +4226,7 @@ build_vec_init (tree base, tree maxindex, tree init, { /* Shortcut zero element case to avoid unneeded constructor synthesis. */ if (init && TREE_SIDE_EFFECTS (init)) - base = build2 (COMPOUND_EXPR, void_type_node, init, base); + base = build2 (COMPOUND_EXPR, ptype, init, base); return base; }