aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2009-08-27 06:33:25 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2009-08-27 06:33:25 +0000
commit4e22772d17868466c3d941f888d255c667abc039 (patch)
tree3e73c7bff7e149d482f5dcdc66345b4eb3e7ae80 /gdb
parent573e8a1cd233066d864f0c0597df9e9cb689fae4 (diff)
downloadgdb-4e22772d17868466c3d941f888d255c667abc039.zip
gdb-4e22772d17868466c3d941f888d255c667abc039.tar.gz
gdb-4e22772d17868466c3d941f888d255c667abc039.tar.bz2
gdb/
* varobj.c (varobj_create): Error if the specified frame was not found and it is needed. gdb/testsuite/ * gdb.mi/mi2-var-cmd.exp (create variable with invalid FRAME-ADDR): New.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.mi/mi2-var-cmd.exp5
-rw-r--r--gdb/varobj.c9
4 files changed, 22 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d802bd..46d3073 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-27 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * varobj.c (varobj_create): Error if the specified frame was not found
+ and it is needed.
+
2009-08-26 Michael Snyder <msnyder@vmware.com>
* i386-tdep.c (i386_process_record): Break out of prefix loop
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6a8aba0..99c9c3d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-27 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.mi/mi2-var-cmd.exp (create variable with invalid FRAME-ADDR): New.
+
2009-08-26 Michael Snyder <msnyder@vmware.com>
* gdb.base/i386-reverse.c: New file.
diff --git a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
index 96d42a1..dda77bb 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
@@ -126,6 +126,11 @@ mi_gdb_test "-var-create int * int" \
"&\"Attempt to use a type name as an expression.\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
"create int"
+# The number 0 must be an invalid frame address and linteger a local variable.
+mi_gdb_test "-var-create invalidframe 0 linteger" \
+ "\\^error,msg=\"Failed to find the specified frame\"" \
+ "create variable with invalid FRAME-ADDR"
+
##### #####
# #
diff --git a/gdb/varobj.c b/gdb/varobj.c
index fbe8ff8..603071f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -565,8 +565,15 @@ varobj_create (char *objname,
we must select the appropriate frame before parsing
the expression, otherwise the value will not be current.
Since select_frame is so benign, just call it for all cases. */
- if (innermost_block && fi != NULL)
+ if (innermost_block)
{
+ /* User could specify explicit FRAME-ADDR which was not found but
+ EXPRESSION is frame specific and we would not be able to evaluate
+ it correctly next time. With VALID_BLOCK set we must also set
+ FRAME and THREAD_ID. */
+ if (fi == NULL)
+ error (_("Failed to find the specified frame"));
+
var->root->frame = get_frame_id (fi);
var->root->thread_id = pid_to_thread_id (inferior_ptid);
old_fi = get_selected_frame (NULL);