diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c96e331e2834..2ee3685e9d0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-18  Kazu Hirata  <kazu@codesourcery.com>
+
+	* tree-iterator.c (expr_only): Remove.
+	* tree.h: Remove the prototype for expr_only.
+
 2009-04-18  Kazu Hirata  <kazu@codesourcery.com>
 
 	* reginfo.c (cannot_change_mode_set_regs): Remove.
diff --git a/gcc/tree-iterator.c b/gcc/tree-iterator.c
index fabe780a9dc5..43218f6b754a 100644
--- a/gcc/tree-iterator.c
+++ b/gcc/tree-iterator.c
@@ -280,29 +280,4 @@ expr_last (tree expr)
   return expr;
 }
 
-/* If EXPR is a single statement return it.  If EXPR is a
-   STATEMENT_LIST containing exactly one statement S, return S.
-   Otherwise, return NULL.  */
-
-tree 
-expr_only (tree expr)
-{
-  if (expr == NULL_TREE)
-    return NULL_TREE;
-
-  if (TREE_CODE (expr) == STATEMENT_LIST)
-    {
-      struct tree_statement_list_node *n = STATEMENT_LIST_TAIL (expr);
-      if (n && STATEMENT_LIST_HEAD (expr) == n)
-	return n->stmt;
-      else
-	return NULL_TREE;
-    }
-
-  if (TREE_CODE (expr) == COMPOUND_EXPR)
-    return NULL_TREE;
-
-  return expr;
-}
-
 #include "gt-tree-iterator.h"
diff --git a/gcc/tree.h b/gcc/tree.h
index e2423ee434c2..a83151dfc2ed 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -4261,7 +4261,6 @@ extern tree convert (tree, tree);
 extern unsigned int expr_align (const_tree);
 extern tree expr_first (tree);
 extern tree expr_last (tree);
-extern tree expr_only (tree);
 extern tree size_in_bytes (const_tree);
 extern HOST_WIDE_INT int_size_in_bytes (const_tree);
 extern HOST_WIDE_INT max_int_size_in_bytes (const_tree);