diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-01 23:29:52 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2010-11-01 23:32:03 -0400 |
| commit | d29b209e37cb85fdf1cb1d8e0ae263cc3c59312b (patch) | |
| tree | 0e6b797a6c1a23c50603805706926a5eaa2184f1 /gcc/c-family | |
| parent | 2450a78a38a727e7ec673b132315c8379db3b27d (diff) | |
| parent | c0000147b2aef6b69e2c6b6d29a9963910f6da98 (diff) | |
| download | gcc-constexpr.tar.gz | |
Merge remote branch 'trunk' into constexprconstexpr
Diffstat (limited to 'gcc/c-family')
| -rw-r--r-- | gcc/c-family/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 897b808be81..b2c90110fef 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2010-11-01 Nicola Pero <nicola.pero@meta-innovation.com> + + Implemented format and noreturn attributes for Objective-C methods. + * c-common.c (handle_noreturn_attribute): Recognize 'noreturn' + attribute for Objective-C methods. + 2010-10-31 Jason Merrill <jason@redhat.com> * c-common.c (conversion_warning, warn_for_collisions_1): Use @@ -177,12 +183,6 @@ * c-opts.c (c_common_init_options_struct): New. Split out from c_common_init_options. -2010-10-20 Jason Merrill <jason@redhat.com> - - * c-common.c (check_case_value): Remove special C++ handling. - - * c-common.c (c_common_reswords): Add __is_literal_type. - 2010-10-06 Nicola Pero <nicola.pero@meta-innovation.com> Implemented fast enumeration for Objective-C. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 923c63afa13..ab050ab2e68 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -5729,7 +5729,8 @@ handle_noreturn_attribute (tree *node, tree name, tree ARG_UNUSED (args), tree type = TREE_TYPE (*node); /* See FIXME comment in c_common_attribute_table. */ - if (TREE_CODE (*node) == FUNCTION_DECL) + if (TREE_CODE (*node) == FUNCTION_DECL + || objc_method_decl (TREE_CODE (*node))) TREE_THIS_VOLATILE (*node) = 1; else if (TREE_CODE (type) == POINTER_TYPE && TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE) |