From patchwork Mon Mar 20 20:36:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 741162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3vn75s4B1fz9rvt for ; Tue, 21 Mar 2017 07:36:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="eBJ40Dff"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=spRrW3ZfLjRuvg3KL2ovNc7I07v9ZnZwG3q4EsCFDhNluE dgGYf71ZdOBY7Ty68cizQ9E8OzIHy46SuDa9E47FV59auP2pcKk8pOl+DtrqlLGb b9Yt50HApYgIZexuBNZx2a3i6sW/REaBdgsTsrGNHbJ06/ltZaobjJd2ty9gQ= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=q2hKsBv9P6oQSyBuovzaIOj61p8=; b=eBJ40DffBAKzqjvjvdtg v/g0OUW2OpUISoN+CpB+SjD3H/eHT55vX+bkWD4ScEvQfzMxuUS/8mNU2cgufPve q3CtZ+xbTT7jTsRwiLwmalPT+Hroft+1/SkkhpMntU3zdNQvVl0xXeK09hXawVvO AIiddtR6AO4yU+orFwgkmuM= Received: (qmail 43911 invoked by alias); 20 Mar 2017 20:36:39 -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 43901 invoked by uid 89); 20 Mar 2017 20:36:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy=misplaced, friend X-HELO: mail-oi0-f48.google.com Received: from mail-oi0-f48.google.com (HELO mail-oi0-f48.google.com) (209.85.218.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Mar 2017 20:36:37 +0000 Received: by mail-oi0-f48.google.com with SMTP id r203so23955832oib.3 for ; Mon, 20 Mar 2017 13:36:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=bpyG5tEh5DJov2kDdRrUWuDxAdncRbOQJ8sGsonFQck=; b=l90nf9kM3GtdY+akdhWK7dwAMbTLfppAJIP8wpzpd56X/fbG5GZLgWXhhgXfAKMy2N jm2m9LHTugTDpTf24scAHWD6fXcPTLYk21EfBOZGj7suZSmrBjjGnglI4YPDUBWkccNA 2+j8sNWRj9zEGP2rCHb8jPAcbtmhwRHlg7JyZEHY5x/YBfe01rYvrIVRNg2NVfYRZ74r qUWr9HYZF7efAjSOLEbaKYcSRbQ1OIt8dItZPNvNDJQOuX8O6hgC5vbvPjE7a3JpAGEQ xznGgPIsgjHWagM5grv9+eWl/NYC3ZyoqCpwcExZTL5SAcPjHULnSe38CvyHxYBDdzjW jaqQ== X-Gm-Message-State: AFeK/H1cfG2xt/nDSSDIobYjXdrLChyzWFqIx72OpG8cNF+0EXjso84oRos5/R3J0df0Ea+pKToJBN9TN795wRvO X-Received: by 10.202.181.10 with SMTP id e10mr16060191oif.117.1490042196433; Mon, 20 Mar 2017 13:36:36 -0700 (PDT) MIME-Version: 1.0 Received: by 10.182.187.8 with HTTP; Mon, 20 Mar 2017 13:36:15 -0700 (PDT) From: Jason Merrill Date: Mon, 20 Mar 2017 16:36:15 -0400 Message-ID: Subject: C++ PATCH for c++/79519, ICE with deleted template friend To: gcc-patches List X-IsSubscribed: yes A while back I fixed =delete of namespace-scope friend functions, but that led to this ICE. Fixed by recognizing that =delete is also a definition in the place that checks for inappropriate definitions of friend functions. Tested x86_64-pc-linux-gnu, applying to trunk. commit 0ba077c5f36b64b1c1bd1e6fb7ec240b06e9351b Author: Jason Merrill Date: Mon Mar 20 15:18:42 2017 -0400 PR c++/79519 - ICE with deleted template friend. * decl.c (grokdeclarator): Complain about misplaced function definition using =, as well. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 0a92566..516b93c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11365,9 +11365,9 @@ grokdeclarator (const cp_declarator *declarator, else if (TREE_CODE (type) == FUNCTION_TYPE) { if (current_class_type - && (!friendp || funcdef_flag)) + && (!friendp || funcdef_flag || initialized)) { - error (funcdef_flag + error (funcdef_flag || initialized ? G_("cannot define member function %<%T::%s%> " "within %<%T%>") : G_("cannot declare member function %<%T::%s%> " diff --git a/gcc/testsuite/g++.dg/cpp0x/deleted13.C b/gcc/testsuite/g++.dg/cpp0x/deleted13.C new file mode 100644 index 0000000..f10551f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/deleted13.C @@ -0,0 +1,12 @@ +// PR c++/79519 +// { dg-do compile { target c++11 } } + +struct A +{ + template void foo(); +}; + +struct B +{ + template friend void A::foo() = delete; // { dg-error "" } +};