From patchwork Fri May 7 16:09:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1475586 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=2620:52:3:1:0:246e:9693:128c; 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=Cxd7Q7Kx; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FcFlT6mtxz9sSs for ; Sat, 8 May 2021 02:09:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 553D43A0C82A; Fri, 7 May 2021 16:09:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 553D43A0C82A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620403788; bh=l2mmBnX+uMC4hM8h3ti0g0LiHswBaHeBXDJOo7/IVIA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Cxd7Q7KxvqGX4Ozq2OwjuZrITO9W0vQuLTwBknUl0hMAONoNfvl6I0QCerN/Q/Aqs 39SgIWkDV60Jb1eEXmLe/2WkV76Hb38KvonXVtkOt0Pitl6yhMg+VGiIuWgDo/XOUE fnoO21hIbp7GsqoSBYr5cnTiRJPMWX9Bs+Y3NNMs= 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 0ED313A0C81D for ; Fri, 7 May 2021 16:09:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0ED313A0C81D Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-glbKvujIP8CFn-18UG3D-w-1; Fri, 07 May 2021 12:09:31 -0400 X-MC-Unique: glbKvujIP8CFn-18UG3D-w-1 Received: by mail-qk1-f197.google.com with SMTP id b3-20020a05620a0cc3b02902e9d5ca06f2so6490688qkj.19 for ; Fri, 07 May 2021 09:09:30 -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=l2mmBnX+uMC4hM8h3ti0g0LiHswBaHeBXDJOo7/IVIA=; b=PRrwkCnfbaPApNS00N3Lj1kccEmmOT1Qf1riveIbPXf7NqeXA00rWdIgM69NtTEazf fxyDPrkwnSVhDXx3Gwar081+Ap2qCZVHbniXjk1bu54Tu42Sq4UPepJjgJw6b5HZssqY VfQI4mOfmJsRw0iI6Zt4psFGwEFVFzPXav5yS664EQAwLUNAtgedTg2gaA5qUdN+s6Lt hffT5QgcPpFOT5UwC3qIO1BgnQT92MAuihbPiaY9nMwY4nMmnZFjecjSX4lkG30yzP6m EhXxWcO/BS17uQXJQleWmwKbXOMhcSOUHx7sFE6WNGmc6Ys4KtxJ1UdCR7R6oGTaHYHh Qozg== X-Gm-Message-State: AOAM5301jveebfUKucCc6Vc5rkdqqXFKsviP84WOD8egfMCMfUof/5nR 0SBvvSdwl05alyewjj8wmisR3Jv/kb2bxWkaUhKMW4vQErm8DFrDNaNePIu9z0YipyVVSYcHBZk 1mQe3B2DpdOsGCHMQQgPs4+xPEsJK7OTxuBTLmOfXFt7QcugPJai4NtQnzjbqlDyLpQ== X-Received: by 2002:a0c:a909:: with SMTP id y9mr10686083qva.20.1620403770084; Fri, 07 May 2021 09:09:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzg/f5zGU+BZLTe/zDGZ+Wpkl5bs1A3loxgQMwWBU02tiJFKh/NbZ8tywQNiZM8XDCMJZjm6g== X-Received: by 2002:a0c:a909:: with SMTP id y9mr10686065qva.20.1620403769765; Fri, 07 May 2021 09:09:29 -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 r185sm5006125qkf.78.2021.05.07.09.09.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 09:09:29 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: avoid non-TARGET_EXPR class prvalues Date: Fri, 7 May 2021 12:09:27 -0400 Message-Id: <20210507160927.4125630-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" Around PR98469 I asked Jakub to wrap a class BIT_CAST_EXPR in TARGET_EXPR; SPACESHIP_EXPR needs the same thing. The dummy CAST_EXPR created in can_convert is another instance of a non-TARGET_EXPR prvalue, so let's use the declval-like build_stub_object there instead. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: * cp-tree.h (build_stub_object): Declare. * method.c (build_stub_object): No longer static. * call.c (can_convert): Use it. * tree.c (build_dummy_object): Adjust comment. * typeck.c (cp_build_binary_op): Wrap SPACESHIP_EXPR in a TARGET_EXPR. --- gcc/cp/cp-tree.h | 1 + gcc/cp/call.c | 2 +- gcc/cp/method.c | 2 +- gcc/cp/tree.c | 3 ++- gcc/cp/typeck.c | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) base-commit: 14ed21f8749ae359690d9c4a69ca38cc45d0d1b0 prerequisite-patch-id: bc368a9ce91fa5c1dcacbcaa3feb2c608a13570a diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a08867aea62..122dadf976f 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -6968,6 +6968,7 @@ extern tree get_copy_ctor (tree, tsubst_flags_t); extern tree get_copy_assign (tree); extern tree get_default_ctor (tree); extern tree get_dtor (tree, tsubst_flags_t); +extern tree build_stub_object (tree); extern tree strip_inheriting_ctors (tree); extern tree inherited_ctor_binfo (tree); extern bool base_ctor_omit_inherited_parms (tree); diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 8e455e59909..d2908b3b0cd 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -12175,7 +12175,7 @@ can_convert (tree to, tree from, tsubst_flags_t complain) /* implicit_conversion only considers user-defined conversions if it has an expression for the call argument list. */ if (CLASS_TYPE_P (from) || CLASS_TYPE_P (to)) - arg = build1 (CAST_EXPR, from, NULL_TREE); + arg = build_stub_object (from); return can_convert_arg (to, from, arg, LOOKUP_IMPLICIT, complain); } diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 0f416bec35b..f8c9456d720 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1793,7 +1793,7 @@ build_stub_type (tree type, int quals, bool rvalue) /* Build a dummy glvalue from dereferencing a dummy reference of type REFTYPE. */ -static tree +tree build_stub_object (tree reftype) { if (!TYPE_REF_P (reftype)) diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 3a20cd33fdc..4ccd7a314f5 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -4175,7 +4175,8 @@ member_p (const_tree decl) } /* Create a placeholder for member access where we don't actually have an - object that the access is against. */ + object that the access is against. For a general declval equivalent, + use build_stub_object instead. */ tree build_dummy_object (tree type) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 50d0f1e6a62..5af47ce89a9 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -5931,6 +5931,8 @@ cp_build_binary_op (const op_location_t &location, if (!processing_template_decl) { + if (resultcode == SPACESHIP_EXPR) + result = get_target_expr_sfinae (result, complain); op0 = cp_fully_fold (op0); /* Only consider the second argument if the first isn't overflowed. */ if (!CONSTANT_CLASS_P (op0) || TREE_OVERFLOW_P (op0))