From patchwork Thu Apr 4 03:13:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 233614 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 5135B2C00A9 for ; Thu, 4 Apr 2013 14:13:40 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; q=dns; s=default; b=sQk86HZkziHKgLAAc fHoskMrIrQgcGIzllW+fMOATX56DqxWUXZfFd+LYk+9Ku3XbI08emLmycP5DJHzd wHZtj1waX/t5yFB+BhfjJ7/l4sQfpYgdiA0+pwWsOFWWHdyJ1JA5S+A/hiLVKtAq yLyuiBuMKzK+J0Zt0TF9OohsXY= 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 :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type; s=default; bh=Gf8DrgCfHASgwoOkC5AyW1z Sq0s=; b=QV26Tig/Q6/aV6OdSWdTdiyaBKb31uQkuNdx3GL3j+L4coukz/dcQiy AaLOSk7X0oHbqe+0M9wU1klh61FD6aagVOJ0znomBIYM+WTysHt4NzjNTVatdCxe r1lv+mlTNcVQH5lvieLHlg4QusoiZWJLrWXEY3bXSwaLaPMzR0QQ= Received: (qmail 23854 invoked by alias); 4 Apr 2013 03:13:31 -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 23844 invoked by uid 89); 4 Apr 2013 03:13:30 -0000 X-Spam-SWARE-Status: No, score=-8.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 04 Apr 2013 03:13:28 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r343DQjO005983 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Apr 2013 23:13:26 -0400 Received: from [10.3.113.56] (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r343DP1w019849 for ; Wed, 3 Apr 2013 23:13:26 -0400 Message-ID: <515CEFD5.8080508@redhat.com> Date: Wed, 03 Apr 2013 23:13:25 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:22.0) Gecko/20100101 Thunderbird/22.0a2 MIME-Version: 1.0 To: gcc-patches List Subject: Re: C++ PATCH to implement C++11 ref-qualifiers References: <5159DA00.5030909@redhat.com> In-Reply-To: <5159DA00.5030909@redhat.com> X-Virus-Found: No On 04/01/2013 03:03 PM, Jason Merrill wrote: > (FUNCTION_OR_METHOD_TYPE_CHECK): New. It turns out that there's already a FUNC_OR_METHOD_CHECK in tree.h, so I'm removing this duplicate. commit 4a01f2f261f9f0cb33bd959a80fe47782474ab18 Author: Jason Merrill Date: Tue Apr 2 21:01:21 2013 -0400 * cp-tree.h (FUNCTION_OR_METHOD_TYPE_CHECK): Remove. (TYPE_RAISES_EXCEPTIONS): Use FUNC_OR_METHOD_CHECK instead. (FUNCTION_REF_QUALIFIED, FUNCTION_RVALUE_QUALIFIED): Likewise. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 83164a2..e1d1238 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -223,9 +223,6 @@ c-common.h, not after. #define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) \ TREE_CHECK(NODE,BOUND_TEMPLATE_TEMPLATE_PARM) -#define FUNCTION_OR_METHOD_TYPE_CHECK(NODE) \ - TREE_CHECK2(NODE,FUNCTION_TYPE,METHOD_TYPE) - #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007) #define THUNK_FUNCTION_CHECK(NODE) __extension__ \ ({ __typeof (NODE) const __t = (NODE); \ @@ -1888,7 +1885,7 @@ struct GTY((variable_size)) lang_type { (for templates) or an OVERLOAD list of functions (for implicitly declared functions). */ #define TYPE_RAISES_EXCEPTIONS(NODE) \ - TYPE_LANG_SLOT_1 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TYPE_LANG_SLOT_1 (FUNC_OR_METHOD_CHECK (NODE)) /* For FUNCTION_TYPE or METHOD_TYPE, return 1 iff it is declared `throw()' or noexcept(true). */ @@ -2536,11 +2533,11 @@ struct GTY((variable_size)) lang_decl { /* 1 iff FUNCTION_TYPE or METHOD_TYPE has a ref-qualifier (either & or &&). */ #define FUNCTION_REF_QUALIFIED(NODE) \ - TREE_LANG_FLAG_4 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TREE_LANG_FLAG_4 (FUNC_OR_METHOD_CHECK (NODE)) /* 1 iff FUNCTION_TYPE or METHOD_TYPE has &&-ref-qualifier. */ #define FUNCTION_RVALUE_QUALIFIED(NODE) \ - TREE_LANG_FLAG_5 (FUNCTION_OR_METHOD_TYPE_CHECK (NODE)) + TREE_LANG_FLAG_5 (FUNC_OR_METHOD_CHECK (NODE)) /* Returns 1 iff VAR_DECL is a construction virtual table. DECL_VTABLE_OR_VTT_P will be true in this case and must be checked