aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2017-10-19 11:27:48 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2018-01-21 15:47:28 +0000
commite707fc445e68ccfa136a52cd4989b0cb778d1ca7 (patch)
treeb84a1d3be858bb6bccf2fc0260562568b5c6de2d
parent03d0bf7b78b142a5e03dfa1c80100893753d0022 (diff)
downloadgdb-e707fc445e68ccfa136a52cd4989b0cb778d1ca7.zip
gdb-e707fc445e68ccfa136a52cd4989b0cb778d1ca7.tar.gz
gdb-e707fc445e68ccfa136a52cd4989b0cb778d1ca7.tar.bz2
gdb: Don't store a thread-id for floating varobj
When creating a varobj with -var-create a user can create either fixed varobj, or floating varobj. A fixed varobj will always be evaluated within the thread/frame/block in which the varobj was created, if that thread/frame/block is no longer available then the varobj is considered out of scope. A floating varobj will always be evaluated within the current thread/frame/block. Despite never using them GDB was storing the thread/frame/block into a floating varobj, and the thread-id would then be displayed when GDB reported on the state of the varobj, this could confuse a user into thinking that the thread-id was relevant. This commit prevents GDB storing the thread/frame/block onto floating varobj, and updates the few tests where this impacts the results. gdb/ChangeLog: * varobj.c (varobj_create): Don't set valid_block when creating a floating varobj. gdb/testsuite/ChangeLog: * gdb.python/py-mi.exp: Don't expect a thread-id for floating varobj. * gdb.mi/mi-var-create-rtti.exp: Likewise.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.mi/mi-var-create-rtti.exp2
-rw-r--r--gdb/testsuite/gdb.python/py-mi.exp12
-rw-r--r--gdb/varobj.c3
5 files changed, 20 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b982be1..0661218 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2018-01-21 Andrew Burgess <andrew.burgess@embecosm.com>
+ * varobj.c (varobj_create): Don't set valid_block when creating a
+ floating varobj.
+
+2018-01-21 Andrew Burgess <andrew.burgess@embecosm.com>
+
* varobj.c (varobj_create): Remove out of date comment.
2018-01-21 Andrew Burgess <andrew.burgess@embecosm.com>
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3a8e6ed..72e1596 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-21 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * gdb.python/py-mi.exp: Don't expect a thread-id for floating
+ varobj.
+ * gdb.mi/mi-var-create-rtti.exp: Likewise.
+
2018-01-21 Don Breazeal <donb@codesourcery.com>
Andrew Burgess <andrew.burgess@embecosm.com>
diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
index 9ea5784..a5310ec 100644
--- a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
@@ -52,6 +52,6 @@ mi_gdb_test "-var-create sp1 * ((void*)\$sp)" \
"\\^done,name=\"sp1\",numchild=\"0\",value=\"$hex\",type=\"void \\*\",thread-id=\"$decimal\",has_more=\"0\"" \
"-var-create sp1 * \$sp"
mi_gdb_test "-var-create sp2 @ ((void*)\$sp)" \
- "\\^done,name=\"sp2\",numchild=\"0\",value=\"$hex\",type=\"void \\*\",thread-id=\"$decimal\",has_more=\"0\"" \
+ "\\^done,name=\"sp2\",numchild=\"0\",value=\"$hex\",type=\"void \\*\",has_more=\"0\"" \
"-var-create sp2 @ \$sp"
gdb_exit
diff --git a/gdb/testsuite/gdb.python/py-mi.exp b/gdb/testsuite/gdb.python/py-mi.exp
index 0ecc5df..bbe1266 100644
--- a/gdb/testsuite/gdb.python/py-mi.exp
+++ b/gdb/testsuite/gdb.python/py-mi.exp
@@ -101,7 +101,7 @@ mi_varobj_update_dynamic container "varobj update 1" {
type_changed false new_num_children 1 dynamic 1 has_more 0
} {
} {
- { name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
+ { name {container.\[0\]} exp {\[0\]} numchild 0 type int }
}
mi_next "next over update 2"
@@ -110,7 +110,7 @@ mi_varobj_update_dynamic container "varobj update 2" {
type_changed false new_num_children 2 dynamic 1 has_more 0
} {
} {
- { name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
+ { name {container.\[1\]} exp {\[1\]} numchild 0 type int }
}
mi_gdb_test "-var-set-visualizer container None" \
@@ -129,8 +129,8 @@ mi_varobj_update_dynamic container "varobj update after choosing default" {
type_changed false new_num_children 2 dynamic 1 has_more 0
} {
} {
- { name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
- { name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
+ { name {container.\[0\]} exp {\[0\]} numchild 0 type int }
+ { name {container.\[1\]} exp {\[1\]} numchild 0 type int }
}
mi_gdb_test "-var-set-visualizer container ContainerPrinter" \
@@ -142,8 +142,8 @@ mi_varobj_update_dynamic container \
type_changed false new_num_children 2 dynamic 1 has_more 0
} {
} {
- { name {container.\[0\]} exp {\[0\]} numchild 0 type int thread-id 1 }
- { name {container.\[1\]} exp {\[1\]} numchild 0 type int thread-id 1 }
+ { name {container.\[0\]} exp {\[0\]} numchild 0 type int }
+ { name {container.\[1\]} exp {\[1\]} numchild 0 type int }
}
mi_list_varobj_children_range container 1 2 2 {
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 523f746..b6a2d8f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -336,7 +336,8 @@ varobj_create (const char *objname,
}
var->format = variable_default_display (var.get ());
- var->root->valid_block = innermost_block.block ();
+ var->root->valid_block =
+ var->root->floating ? NULL : innermost_block.block ();
var->name = expression;
/* For a root var, the name and the expr are the same. */
var->path_expr = expression;