diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/mi-support.exp | 11 | ||||
| -rw-r--r-- | gdb/varobj.c | 8 |
4 files changed, 28 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 53cbdaa..e5b5743 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2007-01-04 Daniel Jacobowitz <dan@codesourcery.com> + + * varobj.c (varobj_list_children): Stop if the number of children is + unknown. + (c_number_of_children): + 2007-01-04 Mark Kettenis <kettenis@gnu.org> * alpha-tdep.c (alpha_register_name): Use ARRAY_SIZE. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 80a5aae..6966dce 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-01-04 Daniel Jacobowitz <dan@codesourcery.com> + + * lib/mi-support.exp (mi_runto_helper): Expect two prompts + when continuing. + 2007-01-04 Pedro Alves <pedro_alves@portugalmail.pt> * gdb.base/annota3.exp ($binfile): Append $EXEEXT. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index ad968ce..fa9d790 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -880,8 +880,17 @@ proc mi_runto_helper {func run_or_continue} { if {$run_or_continue == "run"} { mi_run_cmd } else { - send_gdb "000-exec-continue\n" + send_gdb "000-exec-continue\n" + gdb_expect { + -re "000\\^running\r\n${mi_gdb_prompt}" { + } + timeout { + fail "$test" + return -1 + } + } } + gdb_expect { -re ".*000\\*stopped,thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" { pass "$test" diff --git a/gdb/varobj.c b/gdb/varobj.c index fbd8c82..a9f8ee0 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -685,6 +685,10 @@ varobj_list_children (struct varobj *var, struct varobj ***childlist) if (var->num_children == -1) var->num_children = number_of_children (var); + /* If that failed, give up. */ + if (var->num_children == -1) + return -1; + /* If we're called when the list of children is not yet initialized, allocate enough elements in it. */ while (VEC_length (varobj_p, var->children) < var->num_children) @@ -1711,7 +1715,9 @@ c_number_of_children (struct varobj *var) && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED) children = TYPE_LENGTH (type) / TYPE_LENGTH (target); else - children = -1; + /* If we don't know how many elements there are, don't display + any. */ + children = 0; break; case TYPE_CODE_STRUCT: |