From patchwork Thu Mar 30 22:25:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1763528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.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=Io72cKlA; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PndLN51y8z1yYr for ; Fri, 31 Mar 2023 09:26:20 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2F76A3853D22 for ; Thu, 30 Mar 2023 22:26:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2F76A3853D22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680215178; bh=j6n73Mbq2aNliorI/MllhAgX8FAKaDQ6z/RxuenzUuM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Io72cKlAXjoNbr/v0ihL/cd+qHHdWnMEGsa25r/H53SNLwSaABEJ5BXfbbmOkhb0M KoH90IrTEWVq+H7LlijVFWqIBj6dnNTjlUCr8U/bPzfTUQE585dLj6JdTNlTLeNtfl zOyDTfi6I5mcNEMFifaiDEzLkMlXr6380NxLzTQw= 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 ESMTPS id DE1A03858020 for ; Thu, 30 Mar 2023 22:25:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE1A03858020 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-UCyPHIrbM02evRBcyMPTUw-1; Thu, 30 Mar 2023 18:25:56 -0400 X-MC-Unique: UCyPHIrbM02evRBcyMPTUw-1 Received: by mail-qk1-f200.google.com with SMTP id t21-20020a37aa15000000b00746b7fae197so9543308qke.12 for ; Thu, 30 Mar 2023 15:25:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680215156; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=j6n73Mbq2aNliorI/MllhAgX8FAKaDQ6z/RxuenzUuM=; b=GEYp100zQ7y84DiKXIYeTzCXOrxIveBwEaa36kPCpyUlhoMV2SlhLPqGhYHEl0QGcZ wxrJXvFQZWREMb8U0qJE0zbl6odj2Cct4luwGK0xZPjf7eUQAzW2Gmo/cZTYQAZdBwoS JMbrFWLzowcTto5KzHnA3t8xMa5uDpGy9zok05dwERrBeE6LuElB6R8xijdTXMOOSMma Xpa9ZbrojwS1/pLGqkWqYc6ES4mP5lkTfyzsKd6FZZ8M02wYAIMArD4sOTj5EJrctm5Y zyprq32yvtX5zCUI+NirWZRODuhad5vZKixqirlzzKgKTs+Ruol2F4XUwdc1RE7xCi8L 1szQ== X-Gm-Message-State: AO0yUKUD7hoYRgjvHMT/UTHtTFVVHRIbuaqEW6gATLOFu6UuQ7B/u5N+ iDIdP9jnGcza0bqhSCQso3jljqPSOJUOwEesYMJBVQEID9eE5RKvtOoUYWwzFM/hOpkjzWac4px KXstM3wsTlISiZ1epOl1bKGobbUpeDrbj+ORb2HOlXzpCDMBQqdXdgC41iOQ60sC0mLO2VleBKg == X-Received: by 2002:ac8:5a48:0:b0:3d8:6b0d:f9a6 with SMTP id o8-20020ac85a48000000b003d86b0df9a6mr39964536qta.61.1680215156013; Thu, 30 Mar 2023 15:25:56 -0700 (PDT) X-Google-Smtp-Source: AKy350bBl4JKVPiqSKE95W8qDpj4f/x2sq0rqp/wLbuyMlP79zlBegZ/JReWcWlv+wq9V5lyd1dYmg== X-Received: by 2002:ac8:5a48:0:b0:3d8:6b0d:f9a6 with SMTP id o8-20020ac85a48000000b003d86b0df9a6mr39964502qta.61.1680215155603; Thu, 30 Mar 2023 15:25:55 -0700 (PDT) Received: from jason.cygnus.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id x19-20020ac87313000000b003e302c1f498sm180072qto.37.2023.03.30.15.25.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 15:25:55 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: generic lambda and function ptr conv [PR105221] Date: Thu, 30 Mar 2023 18:25:52 -0400 Message-Id: <20230330222552.793991-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_H2, 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.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" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- We weren't properly considering the function pointer conversions in deduction between FUNCTION_TYPE; we just hardcoded the UNIFY_ALLOW_MORE_CV_QUAL semantics, which are backwards when deducing for a template conversion function like the one in a generic lambda. And when I started checking the ALLOW flags, I needed to make sure they stay set to avoid breaking trailing13.C. PR c++/105221 gcc/cp/ChangeLog: * pt.cc (unify) [FUNCTION_TYPE]: Handle function pointer conversions. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/noexcept-type27.C: New test. --- gcc/cp/pt.cc | 33 ++++++++++++++++++-- gcc/testsuite/g++.dg/cpp1z/noexcept-type27.C | 8 +++++ 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1z/noexcept-type27.C base-commit: 83d2b1ccd17d394d546a38562815ef83daa05e85 diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index e514a277872..dd7f0db9658 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -24472,9 +24472,12 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, return unify_cv_qual_mismatch (explain_p, parm, arg); if (!(strict & UNIFY_ALLOW_OUTER_LEVEL) - && TYPE_P (parm) && !CP_TYPE_CONST_P (parm)) + && TYPE_P (parm) && !CP_TYPE_CONST_P (parm) + && !FUNC_OR_METHOD_TYPE_P (parm)) strict &= ~UNIFY_ALLOW_MORE_CV_QUAL; - strict &= ~UNIFY_ALLOW_OUTER_LEVEL; + /* PMFs recurse at the same level, so don't strip this yet. */ + if (!TYPE_PTRMEMFUNC_P (parm)) + strict &= ~UNIFY_ALLOW_OUTER_LEVEL; strict &= ~UNIFY_ALLOW_DERIVED; strict &= ~UNIFY_ALLOW_OUTER_MORE_CV_QUAL; strict &= ~UNIFY_ALLOW_OUTER_LESS_CV_QUAL; @@ -25022,7 +25025,31 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, RECUR_AND_CHECK_FAILURE (tparms, targs, TREE_PURPOSE (pspec), TREE_PURPOSE (aspec), UNIFY_ALLOW_NONE, explain_p); - else if (nothrow_spec_p (pspec) && !nothrow_spec_p (aspec)) + else + { + bool pn = nothrow_spec_p (pspec); + bool an = nothrow_spec_p (aspec); + /* Here "less cv-qual" means the deduced arg (i.e. parm) has + /more/ noexcept, since function pointer conversions are the + reverse of qualification conversions. */ + if (an == pn + || (an < pn && (strict & UNIFY_ALLOW_LESS_CV_QUAL)) + || (an > pn && (strict & UNIFY_ALLOW_MORE_CV_QUAL))) + /* OK. */; + else + return unify_type_mismatch (explain_p, parm, arg); + } + } + if (flag_tm) + { + /* As for noexcept. */ + bool pn = tx_safe_fn_type_p (parm); + bool an = tx_safe_fn_type_p (arg); + if (an == pn + || (an < pn && (strict & UNIFY_ALLOW_LESS_CV_QUAL)) + || (an > pn && (strict & UNIFY_ALLOW_MORE_CV_QUAL))) + /* OK. */; + else return unify_type_mismatch (explain_p, parm, arg); } diff --git a/gcc/testsuite/g++.dg/cpp1z/noexcept-type27.C b/gcc/testsuite/g++.dg/cpp1z/noexcept-type27.C new file mode 100644 index 00000000000..a691f695389 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type27.C @@ -0,0 +1,8 @@ +// PR c++/105221 +// { dg-do compile { target c++14 } } + +void (*p)(int) = [](auto) noexcept {}; + +int main() { + true ? [](auto) noexcept {} : [](int) {}; +}