From patchwork Sat Feb 15 14:08:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1238538 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=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-519590-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=x0jUhIbX; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FRgc3Oz8; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48KXD61xNQz9sNg for ; Sun, 16 Feb 2020 01:08:51 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:content-type :content-transfer-encoding; q=dns; s=default; b=g7F/i3Ed1dk2W8oY R0EghhhWf9Qw7IcYz7sFsCH2Z8uCAtZ8cLoXqhfAhaAO7fpI5dSdYxRIMVo5GQXs rhN025j4iTHQOHiAwkXQvh2hDYTfpWE5ZkQYsohMcQJHBFWIk4rhvdfZsq3LIDy1 5kG5aCv51FMEKLy2HVLS2wtoNzc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:content-type :content-transfer-encoding; s=default; bh=ETC4J9ytwW61LSzrpR+iBE Qnq+0=; b=x0jUhIbXWlzDnFdCVBdDv/qZGLL25G46q65DL7PpwHYK4X8wgeghY3 A7kvnYxlVqnaREazLFpVQUrmtslwsrU3Ryr7qtwFaLwhsf2e2rRkcHSYxbOBtrvJ ujltKjL3nb3Re9c9K3Bs5jKYe4SqFaxsY6zPRridhFQtESl5+EIbA= Received: (qmail 35134 invoked by alias); 15 Feb 2020 14:08:44 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 35126 invoked by uid 89); 15 Feb 2020 14:08:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=sfinae, H*RU:sk:mail-wr, H*r:sk:mail-wr, HX-Spam-Relays-External:sk:mail-wr X-HELO: us-smtp-delivery-1.mimecast.com Received: from us-smtp-1.mimecast.com (HELO us-smtp-delivery-1.mimecast.com) (205.139.110.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 15 Feb 2020 14:08:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581775721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RwELti5iKIBM0y6xr1O9nnwu+an7A0KWu6ebo4C9T/M=; b=FRgc3Oz8x0IZ+QnTmTsMrIfEDILCc43mHepeya3Gnj9sByntrQcs9uug5WgADIaguAm4x6 VGwH2DNhZFq5mBo9y0RVWwlzbtdCyGbAFGHR+lJnRhgVUjF97RofOuoc3ynByF3uZJeSff gv1oXktlaV+re2+vVJiLo4wDHHFQZQw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-oyn8fX55NjWt4Y1jfll3RA-1; Sat, 15 Feb 2020 09:08:38 -0500 Received: by mail-wr1-f69.google.com with SMTP id r1so5745420wrc.15 for ; Sat, 15 Feb 2020 06:08:38 -0800 (PST) Received: from barrymore.redhat.com ([91.213.143.237]) by smtp.gmail.com with ESMTPSA id n3sm11373777wrs.8.2020.02.15.06.08.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 06:08:35 -0800 (PST) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [committed] c++: Fix lambda in atomic constraint [PR92556] Date: Sat, 15 Feb 2020 15:08:34 +0100 Message-Id: <20200215140834.17379-1-jason@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-IsSubscribed: yes find_template_parameters needs to find the mention of T in the lambda. Fixing that leaves this as a hard error, which may be surprising but is consistent with lambdas in other SFINAE contexts like template argument deduction. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog 2020-02-15 Jason Merrill PR c++/92556 * pt.c (any_template_parm_r): Look into lambda body. --- gcc/cp/pt.c | 9 +++++++++ gcc/testsuite/g++.dg/cpp2a/concepts-lambda5.C | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-lambda5.C base-commit: d71365427670a791c5b54bfec6e3d41210844a8a diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d19bde7bcbe..6c9abb8f3d3 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10479,6 +10479,15 @@ any_template_parm_r (tree t, void *data) } break; + case LAMBDA_EXPR: + { + /* Look in the parms and body. */ + tree fn = lambda_function (t); + WALK_SUBTREE (TREE_TYPE (fn)); + WALK_SUBTREE (DECL_SAVED_TREE (fn)); + } + break; + default: break; } diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-lambda5.C b/gcc/testsuite/g++.dg/cpp2a/concepts-lambda5.C new file mode 100644 index 00000000000..fe471899c14 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-lambda5.C @@ -0,0 +1,10 @@ +// PR c++/92556 +// { dg-do compile { target c++2a } } + +// Having this as a hard error is consistent with template argument deduction; +// it's an open core issue (jason 2020-02-14). +template concept has_value + = requires { []{T::value;}; }; // { dg-error "" } +template void f() { } +template void f() { } +void q() { f(); }