From patchwork Thu Sep 30 08:36:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Pero X-Patchwork-Id: 66139 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 B98E2B70B8 for ; Thu, 30 Sep 2010 18:36:47 +1000 (EST) Received: (qmail 2308 invoked by alias); 30 Sep 2010 08:36:44 -0000 Received: (qmail 2173 invoked by uid 22791); 30 Sep 2010 08:36:42 -0000 X-SWARE-Spam-Status: No, hits=0.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_PSBL, TW_BJ, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (140.186.70.10) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 30 Sep 2010 08:36:37 +0000 Received: from eggs.gnu.org ([140.186.70.92]:37260) by fencepost.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P1Ed1-0000xN-C5 for gcc-patches@gnu.org; Thu, 30 Sep 2010 04:36:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P1Ed0-0001PW-7V for gcc-patches@gnu.org; Thu, 30 Sep 2010 04:36:35 -0400 Received: from smtp161.iad.emailsrvr.com ([207.97.245.161]:35671) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P1Ed0-0001PR-2Y for gcc-patches@gnu.org; Thu, 30 Sep 2010 04:36:34 -0400 Received: from relay26.relay.iad.mlsrvr.com (localhost [127.0.0.1]) by relay26.relay.iad.mlsrvr.com (SMTP Server) with ESMTP id 481CE1B402E for ; Thu, 30 Sep 2010 04:36:33 -0400 (EDT) Received: from dynamic9.wm-web.iad.mlsrvr.com (dynamic9.wm-web.iad.mlsrvr.com [192.168.2.216]) by relay26.relay.iad.mlsrvr.com (SMTP Server) with ESMTP id 3C1811B4024 for ; Thu, 30 Sep 2010 04:36:33 -0400 (EDT) Received: from meta-innovation.com (localhost [127.0.0.1]) by dynamic9.wm-web.iad.mlsrvr.com (Postfix) with ESMTP id 234D5320088 for ; Thu, 30 Sep 2010 04:36:33 -0400 (EDT) Received: by www2.webmail.us (Authenticated sender: nicola.pero@meta-innovation.com, from: nicola.pero@meta-innovation.com) with HTTP; Thu, 30 Sep 2010 10:36:33 +0200 (CEST) Date: Thu, 30 Sep 2010 10:36:33 +0200 (CEST) Subject: ObjC - another bugfix merge from apple/trunk From: "Nicola Pero" To: gcc-patches@gnu.org MIME-Version: 1.0 X-Type: plain Message-ID: <1285835793.143321188@192.168.2.227> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-IsSubscribed: yes 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 Another bugfix merge from the apple/trunk branch ... this fixes an internal compiler error while compiling ObjC++. Committed to trunk. Thanks PS: Apologies for merging bug fixes one by one ... I like to understand exactly each change that I'm committing, and it allows me to work on them incrementally in small chunks Index: gcc/objc/objc-act.c =================================================================== --- gcc/objc/objc-act.c (revision 164744) +++ gcc/objc/objc-act.c (working copy) @@ -3092,7 +3092,9 @@ objc_declare_class (tree ident_list) if (record) { if (TREE_CODE (record) == TYPE_DECL) - type = DECL_ORIGINAL_TYPE (record); + type = DECL_ORIGINAL_TYPE (record) ? + DECL_ORIGINAL_TYPE (record) : + TREE_TYPE (record); if (!TYPE_HAS_OBJC_INFO (type) || !TYPE_OBJC_INTERFACE (type)) Index: gcc/objc/ChangeLog =================================================================== --- gcc/objc/ChangeLog (revision 164744) +++ gcc/objc/ChangeLog (working copy) @@ -1,3 +1,13 @@ +2010-09-30 Nicola Pero + + Merge from 'apple/trunk' branch on FSF servers. + + 2005-10-04 Fariborz Jahanian + + Radar 4278236 + * objc-act.c (objc_declare_class): Pick the right + type tree. + 2010-09-29 Nicola Pero Merge from 'apple/trunk' branch on FSF servers. Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog (revision 164744) +++ gcc/testsuite/ChangeLog (working copy) @@ -1,3 +1,12 @@ +2010-09-30 Nicola Pero + + Merge from 'apple/trunk' branch on FSF servers. + + 2005-10-04 Fariborz Jahanian + + Radar 4278236 + * obj-c++.dg/bad-forward-decl.mm: New + 2010-09-30 Eric Botcazou * ada/acats/run_acats: Revert revision 157037. Index: gcc/testsuite/obj-c++.dg/bad-forward-decl.mm =================================================================== --- gcc/testsuite/obj-c++.dg/bad-forward-decl.mm (revision 0) +++ gcc/testsuite/obj-c++.dg/bad-forward-decl.mm (revision 0) @@ -0,0 +1,3 @@ +class TestCPP { }; /* { dg-error "previous declaration of" } */ + +@class TestCPP; /* { dg-error "redeclared as different kind of symbol" } */