[RFA] Fix for PR mi/15863

Message ID 1402686434-21260-1-git-send-email-keiths@redhat.com
State Committed

Commit Message

Keith Seitz June 13, 2014, 7:07 p.m. UTC
  If an MI client creates a varobj and attempts to update the root
/before/ the inferior is started, gdb will throw an internal error:

-var-create * - batch_flag
-var-update var1
-var-update *
~"../../src/gdb/thread.c:628: internal-error: is_thread_state: Assertion `tp' failed.\nA problem internal to GDB has been detected,\nfurther debugging may prove unreliable.\nQuit this debugging session? "
~"(y or n) "

The function that handles the varobj update in the failing case,
mi_cmd_var_udpate_iter, checks if the thread/inferior is stopped before
attempting to update the varobj. It calls is_stopped (inferior_ptid)
which calls is_thread_state:

    tp = find_thread_ptid (ptid);
    gdb_assert (tp);

When there is no inferior, ptid is null_ptid, and find_thread_ptid (null_ptid)
returns NULL and the assertion is triggered.

This patch changes mi_cmd_var_update_iter to behave the same way
"-var-update var1" does: by calling the thread "stopped" if
there is no inferior (and thereby calling varobj_update_one).

2014-06-13  Keith Seitz  <keiths@redhat.com>

	PR mi/15863
	* mi/mi-cmd-var.c (mi_cmd_var_update_iter): Do not attempt
	to update the varobj if inferior_ptid is null_ptid.

2014-06-13  Keith Seitz  <keiths@redhat.com>

	PR mi/15863
	* gdb.mi/mi-var-cmd.exp: Add test for -var-update before
	the inferior is started.

 gdb/mi/mi-cmd-var.c                 | 4 +++-
 gdb/testsuite/gdb.mi/mi-var-cmd.exp | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)


Tom Tromey June 13, 2014, 8:31 p.m. UTC | #1
>>>>> "Keith" == Keith Seitz <keiths@redhat.com> writes:

Keith> 2014-06-13  Keith Seitz  <keiths@redhat.com>

Keith> 	PR mi/15863
Keith> 	* mi/mi-cmd-var.c (mi_cmd_var_update_iter): Do not attempt
Keith> 	to update the varobj if inferior_ptid is null_ptid.

Keith> testsuite/ChangeLog
Keith> 2014-06-13  Keith Seitz  <keiths@redhat.com>

Keith> 	PR mi/15863
Keith> 	* gdb.mi/mi-var-cmd.exp: Add test for -var-update before
Keith> 	the inferior is started.

Thanks, this is ok.

Keith Seitz June 16, 2014, 6:52 p.m. UTC | #2
On 06/13/2014 01:31 PM, Tom Tromey wrote:
> Thanks, this is ok.

I've pushed this and closed the bug. Thank you for taking a look, Tom.



diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 9059616..08a87bf 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -642,7 +642,9 @@  mi_cmd_var_update_iter (struct varobj *var, void *data_pointer)
   thread_id = varobj_get_thread_id (var);
-  if (thread_id == -1 && is_stopped (inferior_ptid))
+  if (thread_id == -1
+      && (ptid_equal (inferior_ptid, null_ptid)
+	  || is_stopped (inferior_ptid)))
     thread_stopped = 1;
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 46a4e9e..03e1b4c 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -50,6 +50,12 @@  mi_gdb_load ${binfile}
 mi_create_varobj "global_simple" "global_simple" "create global variable"
+# PR mi/15863
+# Attempt to update the varobj before running the inferior.
+mi_gdb_test "-var-update *" \
+	"\\^done,changelist=\\\[\\\]" \
+	"update varobj before running inferior"
 # Test: c_variable-1.2
 # Desc: Create non-existent variable