From patchwork Fri May 7 16:09:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1475584 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@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=fiSHoWSf; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.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 4FcFkl27q9z9sSs for ; Sat, 8 May 2021 02:09:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 393A83896806; Fri, 7 May 2021 16:09:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 393A83896806 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620403755; bh=MT/mT8HOk4QJHesOWz8Ml1RkxPHvzpUx4NWW5HJMyEk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fiSHoWSfvSWyjF1s65kIjNh9B4UPTE/iI4hut1vx5Csus/MV8foGiv2xyAaYYGTPj eW6SS41qVAvOX/ElzJWkv6kduZau1BKowOkL0m6jBKJQc9v6Dbo6sRdEyTHPrcwDLC irFBOxA5KaIPawZ55nAQJv5N6i0BSEUSEOs5OHeY= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 60DE93894C1C for ; Fri, 7 May 2021 16:09:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 60DE93894C1C Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-459-f6V8kCHoNrOQurQrzHS7AQ-1; Fri, 07 May 2021 12:09:10 -0400 X-MC-Unique: f6V8kCHoNrOQurQrzHS7AQ-1 Received: by mail-qt1-f198.google.com with SMTP id d13-20020a05622a05cdb02901c2cffd946bso6014712qtb.23 for ; Fri, 07 May 2021 09:09:10 -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:mime-version :content-transfer-encoding; bh=MT/mT8HOk4QJHesOWz8Ml1RkxPHvzpUx4NWW5HJMyEk=; b=jNbvMUpTHQsQmwM6+sbgCucth8hP/J4jgbth9szDGW0P/MsinvuLJ0VIaXXZ+8yPoT alMXwl2VXZ8RFtnTS+FcF/v3w6szxdV9zVPPCO3v++nwnbggF8Qj4I4ayESG9gjRKHaM DOU2JJMCZZmPA7wZ9jQCCijDkc7X74l031ITbPZELB9cAV4b4Oy1hIOt0R3Hc5CmPmmQ IicPb7Q2tzOEYkMdNoRvk0GqeNDnLVbwdNjdQ2XZIyhHas5jacK7dhF39YMTogWbTEcP 99qrlrJQSzMsnkgWZ9x4Bi1CCxrkQzsWlSIw+FLzWsuXo+dMQbs0oIqg2HWl4nLcFHfv ZvBA== X-Gm-Message-State: AOAM530qW0c+6eG/MCCHPR3K3/VtEbhNXt9Oq1pVRrDn/2yTHT/BgHEY oCIje7q2sgpIh48pOjLWdwPAXIsXGpEst83af+u3AtIW0Kh6rNYF0BrMi7jlTrEbYnzi8p8GqTK ANUW2cZr+uHBLZwyEiMCPvhXRvgj+GgdsT6bWgNkF+cNcgqIT7WxFjQQ1g05OMkAe6w== X-Received: by 2002:a0c:ab88:: with SMTP id j8mr10484177qvb.23.1620403749707; Fri, 07 May 2021 09:09:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwEJTtTzen2m8SChJ7D5XgUPb8GX7ggLv4L7QyRMGAMAlVMVUIpjLvO1Tcf18SR6Lu4OCgnw== X-Received: by 2002:a0c:ab88:: with SMTP id j8mr10484134qvb.23.1620403749306; Fri, 07 May 2021 09:09:09 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id f26sm5202702qtg.17.2021.05.07.09.09.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 09:09:08 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: tweak prvalue test [PR98469] Date: Fri, 7 May 2021 12:09:06 -0400 Message-Id: <20210507160906.4125446-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.7 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@gcc.gnu.org Sender: "Gcc-patches" Discussing the 98469 patch and class prvalues with Jakub also inspired me to change the place that was mishandling BIT_CAST_EXPR and one other to use the lvalue_kind machinery to decide whether something is a prvalue, instead of looking specifically for a TARGET_EXPR. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: * call.c (build_special_member_call): Use !glvalue_p rather than specific tree codes to test for prvalue. (conv_is_prvalue): Likewise. (implicit_conversion): Check CLASS_TYPE_P first. --- gcc/cp/call.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) base-commit: 14ed21f8749ae359690d9c4a69ca38cc45d0d1b0 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 57bac05fe70..8e455e59909 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2133,8 +2133,8 @@ implicit_conversion (tree to, tree from, tree expr, bool c_cast_p, flags, complain); if (!conv || conv->bad_p) return conv; - if (conv_is_prvalue (conv) - && CLASS_TYPE_P (conv->type) + if (CLASS_TYPE_P (conv->type) + && conv_is_prvalue (conv) && CLASSTYPE_PURE_VIRTUALS (conv->type)) conv->bad_p = true; return conv; @@ -8733,8 +8733,7 @@ conv_is_prvalue (conversion *c) return true; if (c->kind == ck_user && !TYPE_REF_P (c->type)) return true; - if (c->kind == ck_identity && c->u.expr - && TREE_CODE (c->u.expr) == TARGET_EXPR) + if (c->kind == ck_identity && c->u.expr && !glvalue_p (c->u.expr)) return true; return false; @@ -10192,8 +10191,7 @@ build_special_member_call (tree instance, tree name, vec **args, && CONSTRUCTOR_NELTS (arg) == 1) arg = CONSTRUCTOR_ELT (arg, 0)->value; - if ((TREE_CODE (arg) == TARGET_EXPR - || TREE_CODE (arg) == CONSTRUCTOR) + if (!glvalue_p (arg) && (same_type_ignoring_top_level_qualifiers_p (class_type, TREE_TYPE (arg)))) {