diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e75bab448a..2e3144ae49 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-17  Tom Tromey  <tromey@redhat.com>
+
+	* value.c (value_entirely_optimized_out): Check the
+	'check_any_valid' field.
+
 2010-11-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* ada-lang.c (modify_general_field): Remove.
diff --git a/gdb/value.c b/gdb/value.c
index 31111cf127..d1ca3dc336 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -519,7 +519,7 @@ value_entirely_optimized_out (const struct value *value)
   if (!value->optimized_out)
     return 0;
   if (value->lval != lval_computed
-      || !value->location.computed.funcs->check_validity)
+      || !value->location.computed.funcs->check_any_valid)
     return 1;
   return !value->location.computed.funcs->check_any_valid (value);
 }