diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-11-27 18:17:14 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-11-27 18:17:14 +0000 |
| commit | 9d780cb2fbf609e85c00d037a570f53a3ea4773c (patch) | |
| tree | 19a4fcdc53c7001b27ccef3f130c8f27436a9ba7 /gcc | |
| parent | 559d60552c6006428fcdedac16209731ad7c917e (diff) | |
| download | gcc-9d780cb2fbf609e85c00d037a570f53a3ea4773c.zip gcc-9d780cb2fbf609e85c00d037a570f53a3ea4773c.tar.gz gcc-9d780cb2fbf609e85c00d037a570f53a3ea4773c.tar.bz2 | |
In gcc/cp/: 2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com>
In gcc/cp/:
2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com>
PR objc++/46222
* decl.c (grokdeclarator): Replaced an assert (for a case that can
never happen in C++, but could happen in ObjC++ for invalid code)
with a check that prints an error message and returns
error_mark_node.
In gcc/testsuite/:
2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com>
PR objc++/46222
* obj-c++.dg/property/at-property-2.mm: Uncommented testcase.
From-SVN: r167202
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/property/at-property-2.mm | 3 |
4 files changed, 29 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f5d612d..6422401 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com> + + PR objc++/46222 + * decl.c (grokdeclarator): Replaced an assert (for a case that can + never happen in C++, but could happen in ObjC++ for invalid code) + with a check that prints an error message and returns + error_mark_node. + 2010-11-23 Jeffrey Yasskin <jyasskin@google.com> PR c++/46527 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 787608c..c494e1c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -9531,7 +9531,21 @@ grokdeclarator (const cp_declarator *declarator, if (friendp == 0) { - gcc_assert (ctype); + /* This should never happen in pure C++ (the check + could be an assert). It could happen in + Objective-C++ if someone writes invalid code that + uses a function declaration for an instance + variable or property (instance variables and + properties are parsed as FIELD_DECLs, but they are + part of an Objective-C class, not a C++ class). + That code is invalid and is caught by this + check. */ + if (!ctype) + { + error ("declaration of function %qD in invalid context", + unqualified_id); + return error_mark_node; + } /* ``A union may [ ... ] not [ have ] virtual functions.'' ARM 9.5 */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7b6f130..d7cb044 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com> + PR objc++/46222 + * obj-c++.dg/property/at-property-2.mm: Uncommented testcase. + +2010-11-27 Nicola Pero <nicola.pero@meta-innovation.com> + * objc.dg/property/at-property-24.m: New. * objc.dg/property/at-property-25.m: New. * obj-c++.dg/property/at-property-24.mm: New. diff --git a/gcc/testsuite/obj-c++.dg/property/at-property-2.mm b/gcc/testsuite/obj-c++.dg/property/at-property-2.mm index 7966b9a..d8433df 100644 --- a/gcc/testsuite/obj-c++.dg/property/at-property-2.mm +++ b/gcc/testsuite/obj-c++.dg/property/at-property-2.mm @@ -8,7 +8,6 @@ } @property int name __attribute__((deprecated)); @property int table __attribute__((xxx)); /* { dg-warning ".xxx. attribute directive ignored" } */ -/* FIXME: the test below should not ICE. -@property void function (void); { dg-error "can.t make .function. into a method" } */ +@property void function (void); /* { dg-error "declaration of function .function. in invalid context" } */ @property typedef int j; /* { dg-error "invalid type for property" } */ @end |