* frame.c (deprecated_safe_get_selected_frame): New function.

	* frame.h (deprecated_safe_get_selected_frame): Add prototype.
	* findvar.c (read_var_value): Call it.

1 files changed, 12 insertions, 0 deletions

diff --git a/gdb/frame.c b/gdb/frame.c
index efcee75ddd..31cb6c5fd9 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -917,6 +917,18 @@ get_selected_frame (void)
   return deprecated_selected_frame;
 }
 
+/* This is a variant of get_selected_frame which can be called when
+   the inferior does not have a frame; in that case it will return
+   NULL instead of calling error ().  */
+
+struct frame_info *
+deprecated_safe_get_selected_frame (void)
+{
+  if (!target_has_registers || !target_has_stack || !target_has_memory)
+    return NULL;
+  return get_selected_frame ();
+}
+
 /* Select frame FI (or NULL - to invalidate the current frame).  */
 
 void