Commit: 0d64823e51de0b0e0a94bdf88940310342a6e6fa - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revisión: 0d64823e51de0b0e0a94bdf88940310342a6e6fa (tree)
• Tiempo: 2017-09-10 05:51:58
• Autor: Simon Marchi <simon.marchi@eric...>
• Commiter: Simon Marchi

Log Message

Remove unnecessary calls to is_mi_like_p in print_thread_info_1

There are two calls to uiout->is_mi_like_p in the else branch of a
if (uiout->is_mi_like_p ()), we already know they will return false.

A bit lower, there are two if (!uiout->is_mi_like_p ()) that we can
merge.

gdb/ChangeLog:

* thread.c (print_thread_info_1): Remove unnecessary calls to
uiout->is_mi_like_p.

Cambiar Resumen

• modified: gdb/ChangeLog
• modified: gdb/thread.c

Diferencia incremental

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Simon Marchi  <[e-mail]>
+
+	* thread.c (print_thread_info_1): Remove unnecessary calls to
+	uiout->is_mi_like_p.
+
 2017-09-09  Tom Tromey  <[e-mail]>
 
 	* namespace.h (add_using_directive): Update.

--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1276,16 +1276,12 @@ print_thread_info_1 (struct ui_out *uiout, char *requested_threads,
 	    return;
 	  }
 
-	table_emitter.emplace (uiout,
-			       (show_global_ids || uiout->is_mi_like_p ())
-			       ? 5 : 4,
+	table_emitter.emplace (uiout, show_global_ids ? 5 : 4,
 			       n_threads, "threads");
 
 	uiout->table_header (1, ui_left, "current", "");
-
-	if (!uiout->is_mi_like_p ())
-	  uiout->table_header (4, ui_left, "id-in-tg", "Id");
-	if (show_global_ids || uiout->is_mi_like_p ())
+	uiout->table_header (4, ui_left, "id-in-tg", "Id");
+	if (show_global_ids)
 	  uiout->table_header (4, ui_left, "id", "GId");
 	uiout->table_header (17, ui_left, "target-id", "Target Id");
 	uiout->table_header (1, ui_left, "frame", "Frame");
@@ -1311,10 +1307,9 @@ print_thread_info_1 (struct ui_out *uiout, char *requested_threads,
 	      uiout->field_string ("current", "*");
 	    else
 	      uiout->field_skip ("current");
-	  }
 
-	if (!uiout->is_mi_like_p ())
-	  uiout->field_string ("id-in-tg", print_thread_id (tp));
+	    uiout->field_string ("id-in-tg", print_thread_id (tp));
+	  }
 
 	if (show_global_ids || uiout->is_mi_like_p ())
 	  uiout->field_int ("id", tp->global_num);