diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-09-30 08:33:54 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-09-30 08:33:54 +0000 |
| commit | 2631eead416342cedd854249572d762ee1ce8efa (patch) | |
| tree | 754a396d22dbd1e221ef1bc225fb2b6c2b4b60be /gcc | |
| parent | 49b91f055dbcf33c0230356a6ff41916c7cac917 (diff) | |
| download | gcc-2631eead416342cedd854249572d762ee1ce8efa.zip gcc-2631eead416342cedd854249572d762ee1ce8efa.tar.gz gcc-2631eead416342cedd854249572d762ee1ce8efa.tar.bz2 | |
In gcc/testsuite/: 2010-09-30 Nicola Pero <nicola.pero@meta-innovation.com>
In gcc/testsuite/:
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
In gcc/objc/:
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.
From-SVN: r164745
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/objc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/bad-forward-decl.mm | 3 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index ffd1c8d..2954a5a 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -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. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index f63cde0..934d78d 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -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)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d287465..0360ef6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. diff --git a/gcc/testsuite/obj-c++.dg/bad-forward-decl.mm b/gcc/testsuite/obj-c++.dg/bad-forward-decl.mm new file mode 100644 index 0000000..e16db7e --- /dev/null +++ b/gcc/testsuite/obj-c++.dg/bad-forward-decl.mm @@ -0,0 +1,3 @@ +class TestCPP { }; /* { dg-error "previous declaration of" } */ + +@class TestCPP; /* { dg-error "redeclared as different kind of symbol" } */ |