diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9c69a143118f2071258bece0c8d374d66f9497a..5f29dbebff917093013ff1396ee2a338589e6341 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-28  Richard Guenther  <rguenther@suse.de>
+
+	* tree.c (is_global_var): Move ...
+	* tree-flow-inline.h (is_global_var): ... here.
+	* tree.h (is_global_var): Remove declaration.
+
 2007-03-28  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.h (X86_TUNE_PROMOTE_HIMODE_IMUL): New tuning
diff --git a/gcc/tree-flow-inline.h b/gcc/tree-flow-inline.h
index 8d1072aaf4d18a8e52fb72b8ffa6e7d622891ca5..f7728e43ed8fc9ae46c12f431bf064f9b02f8c3f 100644
--- a/gcc/tree-flow-inline.h
+++ b/gcc/tree-flow-inline.h
@@ -718,6 +718,17 @@ is_label_stmt (tree t)
   return false;
 }
 
+/* Return true if T (assumed to be a DECL) is a global variable.  */
+
+static inline bool
+is_global_var (tree t)
+{
+  if (MTAG_P (t))
+    return (TREE_STATIC (t) || MTAG_GLOBAL (t));
+  else
+    return (TREE_STATIC (t) || DECL_EXTERNAL (t));
+}
+
 /* PHI nodes should contain only ssa_names and invariants.  A test
    for ssa_name is definitely simpler; don't let invalid contents
    slip in in the meantime.  */
diff --git a/gcc/tree.c b/gcc/tree.c
index 411e3f167461233ab8e85deb8fec8a4c3571c3ae..c0cd2ae2ba50a2e4897207a43467d3f4a2e9cac6 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7602,17 +7602,6 @@ range_in_array_bounds_p (tree ref)
   return true;
 }
 
-/* Return true if T (assumed to be a DECL) is a global variable.  */
-
-bool
-is_global_var (tree t)
-{
-  if (MTAG_P (t))
-    return (TREE_STATIC (t) || MTAG_GLOBAL (t));
-  else
-    return (TREE_STATIC (t) || DECL_EXTERNAL (t));
-}
-
 /* Return true if T (assumed to be a DECL) must be assigned a memory
    location.  */
 
diff --git a/gcc/tree.h b/gcc/tree.h
index 429b2022c2783f4256a2aeb0d1be456abbdbbaf0..c3512960be266fb759f2cc2cbbf029e42ea282e1 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4542,7 +4542,6 @@ extern void expand_function_start (tree);
 extern void stack_protect_prologue (void);
 extern void stack_protect_epilogue (void);
 extern void recompute_tree_invariant_for_addr_expr (tree);
-extern bool is_global_var (tree t);
 extern bool needs_to_live_in_memory (tree);
 extern tree reconstruct_complex_type (tree, tree);