diff options
| -rw-r--r-- | gcc/objc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 29417d9650e..9a2e46b96ab 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,8 @@ +2010-09-27 Richard Guenther <rguenther@suse.de> + + * objc-act.c (objc_get_class_reference): Use CP_TYPE_CONTEXT. + (objc_is_global_reference_p): Use DECL_FILE_SCOPE_P. + 2010-09-26 Nicola Pero <nicola.pero@meta-innovation.com> * objc-act.c: Removed historical, obsolete comment at the top of diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index e98890629c2..e4483da7adb 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -2858,8 +2858,8 @@ objc_get_class_reference (tree ident) : TREE_TYPE (ident)); #ifdef OBJCPLUS - if (TYPE_P (ident) && TYPE_CONTEXT (ident) - && TYPE_CONTEXT (ident) != global_namespace) + if (TYPE_P (ident) + && CP_TYPE_CONTEXT (ident) != global_namespace) local_scope = true; #endif @@ -3251,7 +3251,7 @@ objc_is_global_reference_p (tree expr) return (TREE_CODE (expr) == INDIRECT_REF || TREE_CODE (expr) == PLUS_EXPR ? objc_is_global_reference_p (TREE_OPERAND (expr, 0)) : DECL_P (expr) - ? (!DECL_CONTEXT (expr) || TREE_STATIC (expr)) + ? (DECL_FILE_SCOPE_P (expr) || TREE_STATIC (expr)) : 0); } |