diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 09d5aac2f9..fad36f4551 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-08  Andrew Burgess  <aburgess@broadcom.com>
+            Pedro Alves  <palves@redhat.com>
+
+	* value.c (value_bits_valid): If the value is not lval_computed
+	or has no check validity handler then the answer is the
+	optimized_out flag, otherwise defer to the handler.
+
 2013-07-06  Eli Zaretskii  <eliz@gnu.org>
 
 	* top.c (print_gdb_configuration): Explain in output of
diff --git a/gdb/value.c b/gdb/value.c
index 353f62a2ca..1be1845657 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1082,13 +1082,12 @@ value_entirely_optimized_out (const struct value *value)
 int
 value_bits_valid (const struct value *value, int offset, int length)
 {
-  if (!value->optimized_out)
-    return 1;
   if (value->lval != lval_computed
       || !value->location.computed.funcs->check_validity)
-    return 1;
-  return value->location.computed.funcs->check_validity (value, offset,
-							 length);
+    return !value->optimized_out;
+  else
+    return value->location.computed.funcs->check_validity (value, offset,
+							   length);
 }
 
 int