diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 03040e13af7..10182fcdd1b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-23  Jason Merrill  <jason@redhat.com>
+
+	* tree.c (dependent_name): OFFSET_REF and BASELINK
+	are not dependent names.
+
 2011-12-21  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51611
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 634c2674b5c..dea7632d829 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1463,6 +1463,8 @@ dependent_name (tree x)
   if (TREE_CODE (x) == IDENTIFIER_NODE)
     return x;
   if (TREE_CODE (x) != COMPONENT_REF
+      && TREE_CODE (x) != OFFSET_REF
+      && TREE_CODE (x) != BASELINK
       && is_overloaded_fn (x))
     return DECL_NAME (get_first_fn (x));
   return NULL_TREE;