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.
This commit is contained in:
Simon Marchi 2017-09-09 22:51:58 +02:00
parent eb1e02fd05
commit 0d64823e51
2 changed files with 10 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2017-09-09 Simon Marchi <simon.marchi@ericsson.com>
* thread.c (print_thread_info_1): Remove unnecessary calls to
uiout->is_mi_like_p.
2017-09-09 Tom Tromey <tom@tromey.com> 2017-09-09 Tom Tromey <tom@tromey.com>
* namespace.h (add_using_directive): Update. * namespace.h (add_using_directive): Update.

View File

@ -1276,16 +1276,12 @@ print_thread_info_1 (struct ui_out *uiout, char *requested_threads,
return; return;
} }
table_emitter.emplace (uiout, table_emitter.emplace (uiout, show_global_ids ? 5 : 4,
(show_global_ids || uiout->is_mi_like_p ())
? 5 : 4,
n_threads, "threads"); n_threads, "threads");
uiout->table_header (1, ui_left, "current", ""); uiout->table_header (1, ui_left, "current", "");
uiout->table_header (4, ui_left, "id-in-tg", "Id");
if (!uiout->is_mi_like_p ()) if (show_global_ids)
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", "GId"); uiout->table_header (4, ui_left, "id", "GId");
uiout->table_header (17, ui_left, "target-id", "Target Id"); uiout->table_header (17, ui_left, "target-id", "Target Id");
uiout->table_header (1, ui_left, "frame", "Frame"); 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", "*"); uiout->field_string ("current", "*");
else else
uiout->field_skip ("current"); 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 ()) if (show_global_ids || uiout->is_mi_like_p ())
uiout->field_int ("id", tp->global_num); uiout->field_int ("id", tp->global_num);