Fix nullptr in with_command_1

[deliverable/binutils-gdb.git] / gdb / inferior.c

diff --git a/gdb/inferior.c b/gdb/inferior.c
index e995af816c13105123915bcdcd8890d064e0c774..2d58a11ba85aa0c79479f49719df17928f5a1dc0 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -29,7 +29,7 @@
 #include "observable.h"
 #include "gdbcore.h"
 #include "symfile.h"
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
 #include "cli/cli-utils.h"
 #include "continuations.h"
 #include "arch-utils.h"
@@ -191,7 +191,7 @@ exit_inferior_1 (struct inferior *inftoex, int silent)
   gdb::observers::inferior_exit.notify (inf);
 
   inf->pid = 0;
-  inf->fake_pid_p = 0;
+  inf->fake_pid_p = false;
   inf->priv = NULL;
 
   if (inf->vfork_parent != NULL)
@@ -208,6 +208,10 @@ exit_inferior_1 (struct inferior *inftoex, int silent)
   inf->pending_detach = 0;
   /* Reset it.  */
   inf->control = inferior_control_state (NO_STOP_QUIETLY);
+
+  /* Clear the register cache and the frame cache.  */
+  registers_changed ();
+  reinit_frame_cache ();
 }
 
 void
@@ -477,7 +481,7 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors)
       else
        uiout->field_skip ("current");
 
-      uiout->field_int ("number", inf->num);
+      uiout->field_signed ("number", inf->num);
 
       uiout->field_string ("target-id", inferior_pid_to_str (inf->pid));
 
@@ -492,12 +496,12 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors)
       if (inf->vfork_parent)
        {
          uiout->text (_("\n\tis vfork child of inferior "));
-         uiout->field_int ("vfork-parent", inf->vfork_parent->num);
+         uiout->field_signed ("vfork-parent", inf->vfork_parent->num);
        }
       if (inf->vfork_child)
        {
          uiout->text (_("\n\tis vfork parent of inferior "));
-         uiout->field_int ("vfork-child", inf->vfork_child->num);
+         uiout->field_signed ("vfork-child", inf->vfork_child->num);
        }
 
       uiout->text ("\n");