From patchwork Thu Apr 28 19:17:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1623829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=x5WJ8iXx; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kq53q3VMbz9s0B for ; Fri, 29 Apr 2022 05:17:42 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 503873857356 for ; Thu, 28 Apr 2022 19:17:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 503873857356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1651173459; bh=DtN/9wF1B3gbYB1+ABGtTIiIwWHdvsZY6eKIarQ56Bc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=x5WJ8iXxeU9i9dzvtEak05zDVQDJ6evXB4oA7gTBQ9hwH/XJphtK2UCe1LrB2jZ6D e+vbkX1y1BV9ECE7byRG+pWClcnjiJEKzPvG31BRz1Kvb4cePsxQZo4/x4cYfnskg5 CbVz4ljN0xYMvFtzUAI3i1OnNfP+/s8Wi23KwGmM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id A9B133858D28 for ; Thu, 28 Apr 2022 19:17:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A9B133858D28 Received: by mail-wr1-x433.google.com with SMTP id x18so8074452wrc.0 for ; Thu, 28 Apr 2022 12:17:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=DtN/9wF1B3gbYB1+ABGtTIiIwWHdvsZY6eKIarQ56Bc=; b=XrwPyAXIVa538ckc/3vxbJCQUtt1gNgpPfI28cvSldyCcsPGz63N1nYAuNAn3qyMeg YBASo4TtdqmIbyQyO1+2czvJemoBFzQYSj5QBGJmBXORPxaNVlWeJdtQ2iZDlRLgLPAz ChMb2WfM0hskpvkUPRvvCAUDBSOG0TzaWvM9HLcHrtWpkUUH8ptlHdQCfTBx9840VDL+ Lt7crKJPW6v9MKfHGU8FD4XBr57vFyQL2c9C5kfaW9R0k+2Z9AHfQ0HJdEjm28R+f5Vz bU48qWnVjylj+/unFZHCiaVIUUBL915adaFOgqRsZsKNW++zS31Twjc6eXKqe4FmXJAq mI1g== X-Gm-Message-State: AOAM532ajxhn8eZRsXS+uqNHlWToWBiibV/aTVJ22RVLMIonl47w/d7c n/hatIJukpGpjm5MCx089Xy5zD0SPMg= X-Google-Smtp-Source: ABdhPJxcUwbpnaVo9hSbqQc951L256RAEMpEj1DHYorNz2hA8mDNO9qkO7uIhIbfX1+TujpGi4uhmg== X-Received: by 2002:a5d:6f0c:0:b0:20a:7db1:3408 with SMTP id ay12-20020a5d6f0c000000b0020a7db13408mr27749098wrb.267.1651173431448; Thu, 28 Apr 2022 12:17:11 -0700 (PDT) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id n5-20020a05600c3b8500b00393fb9923basm666046wms.39.2022.04.28.12.17.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2022 12:17:10 -0700 (PDT) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++, coroutines: Partial reversion of r12-8308-g15a176a833f23e [PR105426]. Date: Thu, 28 Apr 2022 20:17:04 +0100 Message-Id: <20220428191704.89750-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe , jakub@redhat.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The changes to fix PR 105287 included a tightening of the constraints on which variables are promoted to frame copies. This has exposed that we are failing to name some variables that should be promoted. The long-term fix is to address the cases where the naming has been missed, but for the short-term (and for the GCC-12 branch) backing out the additional constraint is proposed. This makes the fix for PR 105287 more conservative. tested on x86_64-darwin, with the reproducer from the PR which now produces the correct output for both optimised and unoptimised code. OK for master? OK for GCC-12? thanks, Iain Signed-off-by: Iain Sandoe PR c++/105426 gcc/cp/ChangeLog: * coroutines.cc (register_local_var_uses): Allow promotion of unnamed temporaries to coroutine frame copies. --- gcc/cp/coroutines.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index 551ddc9cc41..2e393b2cddc 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -3973,6 +3973,9 @@ register_local_var_uses (tree *stmt, int *do_subtree, void *d) else if (lvname != NULL_TREE) buf = xasprintf ("%s_%u_%u", IDENTIFIER_POINTER (lvname), lvd->nest_depth, lvd->bind_indx); + else + buf = xasprintf ("_D%u_%u_%u", DECL_UID (lvar), lvd->nest_depth, + lvd->bind_indx); /* TODO: Figure out if we should build a local type that has any excess alignment or size from the original decl. */ if (buf)