From patchwork Tue Oct 15 04:47:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1997193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ukp7SrHP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSM6f3trtz1xvy for ; Tue, 15 Oct 2024 15:48:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BCABB3857BB3 for ; Tue, 15 Oct 2024 04:48:08 +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 ESMTP id A3335385828B for ; Tue, 15 Oct 2024 04:47:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3335385828B 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 A3335385828B 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=1728967667; cv=none; b=VyTHtlLj77zs2HtQLkEexR/ADM1hkbU5OPGYNSRPMiPvJMO2ZdtUMyHxrbl6psY3NT3zxZrfPgLy6tGWt95jaGzvALJNKj6s0fW0T3EMiL3wS9MtNGgUGj5xqkHuz5ti8xA2D+0dg1NYna2Mi8ho697lVQcIdgFd6qv9Cql6Sxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728967667; c=relaxed/simple; bh=P1fa8Ua/4HFMvqm7nmTNTNJw9o4xgyRjuZiGrycZFcw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=K0DxIjrcD+l7ho5EttOSnUAOSI0875EtUJAUsyWJ4wnei37isVVucLqwXK7nCyTEsGEOvxe/DgYXudjReWhiFH+K3+bzCIvxXIpVbZsst6OO2ppLvRfSq016pVxICIQ90UWrGOW9YMA0hEwa6e8X9nuBBZOI/XylQPHoJVTYJRk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728967664; 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=lslFBsuJpZPOTcRd5dL6d8nN2YSlCNZYzOQPiwFbHow=; b=Ukp7SrHPdwGFf3jEwO0aUjP1Ev01sFV9sFLIs3vRzqM6Ijpd5Tk/5HCrXeVRguLL5SM68V ey9fJZV9S6s85K5LiR2ldHi0OuZsEQs6+P28MeWbhQkh+ByF9DHVqHG+25DMimNKzYoexw W0QOUmlEDHwnjpm176xz0nwjc/hh6hQ= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-7K205jS8OsOP4pXbjD6JVA-1; Tue, 15 Oct 2024 00:47:42 -0400 X-MC-Unique: 7K205jS8OsOP4pXbjD6JVA-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7b1115c886eso32452585a.1 for ; Mon, 14 Oct 2024 21:47:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728967660; x=1729572460; 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=lslFBsuJpZPOTcRd5dL6d8nN2YSlCNZYzOQPiwFbHow=; b=nFs2UrC1P3UgdNB/0yzUA18uRJErDw8PTTqNMfzAS9hpGsK4+N+a4lsDwiWGst/sxt FYWs0Yl+wuQMrnm28Uv2Nfp3qGF61Vxvqo0tIYpPdCSeKFdUZ5W+CWd81LYVH7iYwzI/ 5+C84oty7C4M7uIA6Z26yGO2Jgo+tcp/GpfJY2YPnNLwyhPgRtkIzVfu6NwH3ZYImWZZ c22ZdmTGIzuzbb5ga5PyeA+Yz3VuOa01WUE6Jya5635qr9Mg+lmmIyasABKRTt6hqFHS losE5F0CSmbcNi9TPhWlB2GQIQh5Y+duUenGNNGXyqRTfNUbKimpUF5pL7obtaQnbCeB DDXQ== X-Gm-Message-State: AOJu0YzpxEHEMB9j6vyERKYzAPMHoOgVg8vfidlOX8rKZb8E21CR/211 EgJU1rCGPF3Vq2kD1tTxw3X7/8pzPgJFPufLPZMbXAq/KECrgP5tvU1A0pQk8TmJaYNeX012tQx fw2UN4jihd0YpmFE8HfIchFL1qOn8fUmHPqwsY/JL8DnUD2Anw/54cuoj2GOph/eIINtPXxV+Eq Ow0eXPcyesE/swGFHQ4dt7d7Emy/ZoblU7hwMw X-Received: by 2002:a05:620a:1a20:b0:7a9:bf88:7d9a with SMTP id af79cd13be357-7b11a3a1a8fmr874511485a.10.1728967660571; Mon, 14 Oct 2024 21:47:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG1Cip9IaOQjh0Hlh7ch4oBlz7p/vwknuP/2eY57htZSsjvFRGD4BzVdpHVg9wnnrIZ9n6Tvg== X-Received: by 2002:a05:620a:1a20:b0:7a9:bf88:7d9a with SMTP id af79cd13be357-7b11a3a1a8fmr874510185a.10.1728967660018; Mon, 14 Oct 2024 21:47:40 -0700 (PDT) Received: from localhost.localdomain (ool-18bb2a2e.dyn.optonline.net. [24.187.42.46]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b1363b4388sm23475185a.122.2024.10.14.21.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 21:47:39 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++: unifying lvalue vs rvalue (non-forwarding) ref [PR116710] Date: Tue, 15 Oct 2024 00:47:37 -0400 Message-ID: <20241015044737.1488180-1-ppalka@redhat.com> X-Mailer: git-send-email 2.47.0.72.gef8ce8f3d4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.5 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_H3, 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~incoming=patchwork.ozlabs.org@gcc.gnu.org Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- When unifying two (non-forwarding) reference types, unify immediately recurses into the reference type without first comparing rvalueness. (Note that at this point forwarding references have already been collapsed into non-references by maybe_adjust_types_for_deduction.) gcc/cp/ChangeLog: * pt.cc (unify) : Compare rvalueness. gcc/testsuite/ChangeLog: * g++.dg/template/unify12.C: New test. --- gcc/cp/pt.cc | 3 ++- gcc/testsuite/g++.dg/template/unify12.C | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/unify12.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index af784a41265..c7cbf6df26c 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -25154,7 +25154,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, } case REFERENCE_TYPE: - if (!TYPE_REF_P (arg)) + if (!TYPE_REF_P (arg) + || TYPE_REF_IS_RVALUE (parm) != TYPE_REF_IS_RVALUE (arg)) return unify_type_mismatch (explain_p, parm, arg); return unify (tparms, targs, TREE_TYPE (parm), TREE_TYPE (arg), strict & UNIFY_ALLOW_MORE_CV_QUAL, explain_p); diff --git a/gcc/testsuite/g++.dg/template/unify12.C b/gcc/testsuite/g++.dg/template/unify12.C new file mode 100644 index 00000000000..84e4efb4cd9 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/unify12.C @@ -0,0 +1,24 @@ +// PR c++/116710 +// { dg-do compile { target c++11 } } + +template struct A : T {}; + +template +void f(void (*)(T &), typename A::type * = 0); + +void f(...); + +void g(int &&); + +void q() { f(g); } // OK + +template +struct B { operator B(); }; + +template +void h(B); + +int main() { + B b; + h(b); // { dg-error "no match" } +}