From: Thiago Jung Bauermann <bauerman@br.ibm.com>
Date: Fri, 4 Mar 2011 20:00:34 +0000 (+0000)
Subject: 	* breakpointc (print_it_typical): Move NULL check from here...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a6a67de742adc3d1400df7567962fd9e98594c5;p=binutils-gdb.git

	* breakpointc (print_it_typical): Move NULL check from here...
	(print_bp_stop_message): ... to here.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 48c9446c4b6..7634ec4f8b2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* breakpointc (print_it_typical): Move NULL check from here...
+	(print_bp_stop_message): ... to here.
+
 2011-03-04  Michael Snyder  <msnyder@msnyder-server.eng.vmware.com>
 
 	* breakpoint.c (enable_command): Use break instead of continue,
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 6f087b3c65d..5bcab8710ad 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3309,11 +3309,6 @@ print_it_typical (bpstat bs)
   int bp_temp = 0;
   enum print_stop_action result;
 
-  /* bs->breakpoint_at can be NULL if it was a momentary breakpoint
-     which has since been deleted.  */
-  if (bs->breakpoint_at == NULL)
-    return PRINT_UNKNOWN;
-
   gdb_assert (bs->bp_location_at != NULL);
 
   bl = bs->bp_location_at;
@@ -3519,10 +3514,14 @@ print_bp_stop_message (bpstat bs)
       {
 	struct breakpoint *b = bs->breakpoint_at;
 
+	/* bs->breakpoint_at can be NULL if it was a momentary breakpoint
+	   which has since been deleted.  */
+	if (b == NULL)
+	  return PRINT_UNKNOWN;
+
 	/* Normal case.  Call the breakpoint's print_it method, or
 	   print_it_typical.  */
-	/* FIXME: how breakpoint can ever be NULL here?  */
-	if (b != NULL && b->ops != NULL && b->ops->print_it != NULL)
+	if (b->ops != NULL && b->ops->print_it != NULL)
 	  return b->ops->print_it (b);
 	else
 	  return print_it_typical (bs);