Re: ObjC - another bugfix merge from apple/trunk

[Richard Guenther <richard dot guenther at gmail dot com>]

On Thu, Sep 30, 2010 at 10:36 AM, Nicola Pero
<nicola.pero@meta-innovation.com> wrote:
> 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

Well, I think that's exactly the right thing to do (otherwise I guess I would
have complained already ;)).

Thanks,
Richard.

> 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 ?<nicola.pero@meta-innovation.com>
> +
> + ? ? ? Merge from 'apple/trunk' branch on FSF servers.
> +
> + ? ? ? 2005-10-04 ?Fariborz Jahanian <fjahanian@apple.com>
> +
> + ? ? ? Radar 4278236
> + ? ? ? * objc-act.c (objc_declare_class): Pick the right
> + ? ? ? type tree.
> +
> ?2010-09-29 ?Nicola Pero ?<nicola.pero@meta-innovation.com>
>
> ? ? ? ?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 ?<nicola.pero@meta-innovation.com>
> +
> + ? ? ? Merge from 'apple/trunk' branch on FSF servers.
> +
> + ? ? ? 2005-10-04 ?Fariborz Jahanian <fjahanian@apple.com>
> +
> + ? ? ? Radar 4278236
> + ? ? ? * obj-c++.dg/bad-forward-decl.mm: New
> +
> ?2010-09-30 ?Eric Botcazou ?<ebotcazou@adacore.com>
>
> ? ? ? ?* 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" } */
>
>
>