From patchwork Tue Apr 26 21:13:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 92960 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]) by ozlabs.org (Postfix) with SMTP id AADF11007DF for ; Wed, 27 Apr 2011 07:14:28 +1000 (EST) Received: (qmail 1501 invoked by alias); 26 Apr 2011 21:14:22 -0000 Received: (qmail 1491 invoked by uid 22791); 26 Apr 2011 21:14:21 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, TW_BJ, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 26 Apr 2011 21:14:03 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3QLE0E4013914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Apr 2011 17:14:00 -0400 Received: from [127.0.0.1] (ovpn-113-113.phx2.redhat.com [10.3.113.113]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3QLDwNu008421; Tue, 26 Apr 2011 17:13:59 -0400 Message-ID: <4DB73596.3030300@redhat.com> Date: Tue, 26 Apr 2011 17:13:58 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110307 Fedora/3.1.9-0.39.b3pre.fc14 Lightning/1.0b2 Thunderbird/3.1.9 MIME-Version: 1.0 To: Rainer Orth CC: GCC Patches Subject: Re: [PATCH, C++] Remove unused cp_fold_obj_type_ref References: <20110422132335.GB331@virgil.arch.suse.de> In-Reply-To: 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 On 04/26/2011 02:07 PM, Rainer Orth wrote: > the patch was so obvious that it broke bootstrap: I'm applying this patch to fix bootstrap. commit 922f4a593d65ab65025b0af7b59bb9513d394aac Author: jason Date: Tue Apr 26 21:12:57 2011 +0000 * objc-act.c (objc_fold_objc_type_ref): Remove. * objc-act.h: Remove prototype. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 0b6b793..250b317 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -8602,33 +8602,6 @@ objc_type_valid_for_messaging (tree type, bool accept_classes) return false; } -/* Fold an OBJ_TYPE_REF expression for ObjC method dispatches, where - this occurs. ObjC method dispatches are _not_ like C++ virtual - member function dispatches, and we account for the difference here. */ -tree -#ifdef OBJCPLUS -objc_fold_obj_type_ref (tree ref, tree known_type) -#else -objc_fold_obj_type_ref (tree ref ATTRIBUTE_UNUSED, - tree known_type ATTRIBUTE_UNUSED) -#endif -{ -#ifdef OBJCPLUS - tree v = BINFO_VIRTUALS (TYPE_BINFO (known_type)); - - /* If the receiver does not have virtual member functions, there - is nothing we can (or need to) do here. */ - if (!v) - return NULL_TREE; - - /* Let C++ handle C++ virtual functions. */ - return cp_fold_obj_type_ref (ref, known_type); -#else - /* For plain ObjC, we currently do not need to do anything. */ - return NULL_TREE; -#endif -} - void objc_start_function (tree name, tree type, tree attrs, #ifdef OBJCPLUS diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h index 909181a..d604299 100644 --- a/gcc/objc/objc-act.h +++ b/gcc/objc/objc-act.h @@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see bool objc_init (void); const char *objc_printable_name (tree, int); -tree objc_fold_obj_type_ref (tree, tree); int objc_gimplify_expr (tree *, gimple_seq *, gimple_seq *); void objc_common_init_ts (void);