aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2010-09-27 15:46:07 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2010-09-27 15:46:07 +0000
commitfa2ea33de80cd95b2a1d1a759b2271cb8d7e32db (patch)
tree5df1b0528ff2655dcc5b87833cc2f50741b81bba
parent1787f59e44205f742abeffc49c28fb31f72a2723 (diff)
downloadgcc-fa2ea33de80cd95b2a1d1a759b2271cb8d7e32db.zip
gcc-fa2ea33de80cd95b2a1d1a759b2271cb8d7e32db.tar.gz
gcc-fa2ea33de80cd95b2a1d1a759b2271cb8d7e32db.tar.bz2
objc-act.c (objc_get_class_reference): Use CP_TYPE_CONTEXT.
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. From-SVN: r164652
-rw-r--r--gcc/objc/ChangeLog5
-rw-r--r--gcc/objc/objc-act.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 29417d9..9a2e46b 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 e988906..e4483da7 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);
}