From patchwork Sat Sep 9 20:53:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 22786 Received: (qmail 113189 invoked by alias); 9 Sep 2017 20:53:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 113175 invoked by uid 89); 9 Sep 2017 20:53:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 09 Sep 2017 20:53:58 +0000 Received: from ESESSHC012.ericsson.se (Unknown_Domain [153.88.183.54]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id B9.F0.22679.3E454B95; Sat, 9 Sep 2017 22:53:55 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.54) with Microsoft SMTP Server (TLS) id 14.3.352.0; Sat, 9 Sep 2017 22:53:54 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.localdomain (80.216.43.226) by AM3PR07MB308.eurprd07.prod.outlook.com (2a01:111:e400:881b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.4; Sat, 9 Sep 2017 20:53:52 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] Remove unnecessary calls to is_mi_like_p in print_thread_info_1 Date: Sat, 9 Sep 2017 22:53:40 +0200 Message-ID: <1504990420-7048-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1PR0802CA0015.eurprd08.prod.outlook.com (2603:10a6:3:bd::25) To AM3PR07MB308.eurprd07.prod.outlook.com (2a01:111:e400:881b::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 872fdee5-40fe-4386-6bcf-08d4f7c4e139 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM3PR07MB308; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 3:TMogMSuJwk8Qn+agZU6XObqU/yqKSqHK4w48ZzCbVuyCrz5Zhj8oChhjYVElmaIQYobLtjmtd65YRmb+jpyHdg4Wr+OKD2XSRzM+ma05Y9S5qEUSaIz8sdVuk49oJVSxERsWJtvPOCitQyYvy/pnhktrG58Wa1BGVeY9Xz2kEsYPeI/+MfmfVt/i9nsMchuiP/YfMVX/xC5NggMp6FecTctEoGRSwQ2NVJ9WDM7s8S+Whq4WrceMthZGbrU75T51; 25:f7x4/26aXyC/KuGSD6rf3YP89A8uhVNihfRtDFgpym4oGlVLLSjMDHbgi6UyKUhsJmzcuLlIaSu3l55N8HjObMw38haW5m//k6BplEPFLfdayZ7sWpEJSvmBWELunVBn867JKfLUVd1pOLYOOI9d5hpXFJq17pFBLPxHh8TJzn50H52IHO+z9uIpuBtNikwq7EqNypm5Dl5ZFF6UpxeMPLharK+DAWri43nf7oXZy7Zpn+dIT+b7sDPHISkQj77Qoacax4IDvornSB6IKJeA9E3kz8AVu6YPNzZuu09ANBcvmJIHoBTqEpU1682vaHX/Nx0qg/vC3wHErWTgzL54Iw==; 31:cIqCK8f6Qhk++7lxMwNhz40fAbpwh0L5zxihnrEj0ACMujlO9Up8RtQO/pVSvUMqDugFjEyL4dVbT29qvRq/u9alRt2/LHMzMzHrj0dI/ndi2B94pUrtSQUfkzoyxIro/5kq8UrfEhSkO8f0vawS6EkeckAb2key8L2mwBMZ1fvSkcFF7D3BlcGfdXX4YTSePwct+kolYcSMbYmcJxzLzQsi1AOOFPOdVUdSlYNYXN8= X-MS-TrafficTypeDiagnostic: AM3PR07MB308: X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 20:HKbtjY9Yv9iGH8pF34vKTKz1y6kV/fEY15sg3JkKIch56AcwFkD1MmCCSebm+S4UGVUswEJYRGS+Lsho2/3xyiyNl8u/dHsQDq2VOBgdQoIQPbVVCYlGIAmSk6kfLdBDQVdsfVMhANNz2DR5rhOy0FcMkqJEGIOaq7Sdh8IrMGpblABLLybz+GFbnKhTEfVWcoLjk1OXTgKDgbXO+foDzTR5ojSQvJMKkvZw8nkSvHvHoudP6qFyxxIz3imJ3LpFmlpgFYcGrwQBdVK92gNyLmpWmicKntmsNoWJsSOlCyK4IbiREgKHQoWr0HqIclNxwh+6PS2n+c4o9n0P9a5Y/O7Ag9l3XTilYHQ4OcMk8YSk+/RgCX20sxYnNSM2lhMfFKrImzFkoMZptAJ7R9sfzn15z+z7raZYa0mu+Ku7pOyVRVqAQG5ZgQCOImmgAwVOWFHcOxKGXiZyLmTWyRpFC2Piqvla5ktl/2X0tlqWD6LFMH5hmPVDdjZbJfnRqfD/; 4:FT1rRscK4aBck2J0DqBMKvahjswzooUjZt9FWRvOBqIzEF/lziEs+IqxS2uEJHXXf6Q9mECy9C5EImqjLYVABTwYbFT5InUtpXnakTLab2PNa/WggAYv291xXDV4KSbeiQtxTz3nDbmR5DTOpDiTK4bR9ANDA8+pQxJgG7ZZZbzQqyArUJfjJoKnRNCNMaCOztzbUw0FS4hI2OwSXSdr6xsartbml8jXc1I3INRZETlAO2kZckDr4rLc3BFLGXuNDXLGKwQkfakZ5wV9SdqXhqerNCLg/QMKrhGsFcAMILY= X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6041248)(20161123558100)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR07MB308; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR07MB308; X-Forefront-PRVS: 0425A67DEF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(189002)(54534003)(377424004)(199003)(68736007)(5003940100001)(6666003)(86362001)(4326008)(107886003)(110136004)(42186005)(50986999)(6512007)(81166006)(81156014)(6116002)(53936002)(8676002)(3846002)(2361001)(101416001)(33646002)(2351001)(105586002)(106356001)(36756003)(478600001)(48376002)(97736004)(50466002)(25786009)(305945005)(47776003)(66066001)(7736002)(50226002)(5660300001)(189998001)(7350300001)(6916009)(2906002)(6506006)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR07MB308; H:elxacz23q12.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR07MB308; 23:seTWOJkMIUycVeLlrlAIRJn9SL1WzB5lCdPykcDsp3?= =?us-ascii?Q?qnYzjvMwXN6OePOt7F7MrGUPT1/3ywx/o2Ak1u5DPfVNc3fCIxyHQWj/WcH6?= =?us-ascii?Q?icX+ieVfnCFNpByS2msavm/bUSx6RftlhTlMhlxgACzCD6py5IHwLSLcqKpU?= =?us-ascii?Q?dBbJB75GOYmwVWmdoz5BV0lU2F37+uBbPqnOKy0mZkHtJznBLvSArd6BcHUi?= =?us-ascii?Q?X4+QjBH7HzoYPirndjRypb/JwqyS6dqJMfnC7sqggFovqCi9GiV0OJ30JSaO?= =?us-ascii?Q?qTPERceePT6rEjewmb7rZRBLRfGwmUKI3pDnOliK0/3gcD5k0hYZ0zinGn0c?= =?us-ascii?Q?Vm4bft2+bwAUC82cg3a+fUMp8CjR5JJU9PuB07/ucZUSrEG59IUYOGEaPdVf?= =?us-ascii?Q?MkXevx+AIRkJ1QPE6pBEK1p90KlOYFnTUKVImZNDBZONCl0xtgztvZrhHKDF?= =?us-ascii?Q?x8dQl2r1wsKq9iN+S+//h5yh3CotMwPkcWvQ/7ybNcNh8JrgmQ4q8t/jEe03?= =?us-ascii?Q?+zVja6N82uE0vEijnhctz2p5dVJPuYSzytbsAr6FSluLgs+meu/uEYlTBgFy?= =?us-ascii?Q?Hj4mfwpB2HOww2o1YUGFM6j+PRpm/+tt2Shu36PrfnjHDpAk7LzlRYg9IEa+?= =?us-ascii?Q?eryMXgCAzShoMKkkQDn1ggrkOhx8astRHQX+8jmW9P465WxVHeqyn28sIDwZ?= =?us-ascii?Q?nBZhEtabIF8knpcaLIXlkzeAD6Q1ilZrs/dBX8PW4DlOYRdcSdjQhKQPzMNa?= =?us-ascii?Q?r8RKN58nlKvvQaJU5XRboeSxUf+jsBG/x0XF59YAdCFMw1aOyr9lbo5RE8qM?= =?us-ascii?Q?VakttzsZmrctnhTkHbhS0wXSr7VXNj4nC+dz32KHCuVfeFBGTQfdhXRF1O/+?= =?us-ascii?Q?PXt/pR2T4izgv2HMvxfF8NowcrckR6GNIKvk3WTNvs8CLbwMWA3vyF7wKD1k?= =?us-ascii?Q?/VuRRwRLUoR3wZPtam4/XmM/VtrEZR0qYihceQOTknCxgh8Q2rLTUxHXg/Rf?= =?us-ascii?Q?4f2PftLrKUjAHsj/eWtwEomR3NhRaHzBu+5/0AHxjPbRMbBpz1fTu7Je9EzQ?= =?us-ascii?Q?jB5TrSZeEXjxgXxhpa/mFPXqmDFmdmofIFWJKMLKwn9VO7HWZ6P+vPa5nTT2?= =?us-ascii?Q?yQXGqMfPmh1aUtSvPBSp1tM5R2NLba?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB308; 6:fxOA1xtLENbHrZkqZk3zN3Z2wJm80d224izT4ycLIY8qEuf+0EoK93/BVCTXGbQx6u1P2MBJaO02CtVDBelXbw5VZ527MEto38ZMzuI0FZlnu492hQKkhgz50OYRIolyyFqS2E3zwOsZ0QlSeDqmxS7GOK4oLa0USzZeAhinhi+oKaqRrwccaA+vFHINpsMpd2xYJrFPBDqAYY9HCqXFfnc3HrpN9yzgf1uHIAlW95uZ4DBhy8rLlFnuC6hvmhdOtKHsbxu7RpHyKt7edgPDw2OKdzKijMa+hHaqJ3wfplZ7lxK/TKZNDq6pZtVHgom+AdjSAp0YaMjKzDEN4kivWQ==; 5:r7/1ebSHxlRbEntisg5c10cKjd0zgDLHdrqXUqisZUPDBn8Dy/NF+ZajZpGTpKGaoGqdxDKPSFjRwgtnmWJJ8GiZtPnMBHRxpkZqh38Y6Sg061G2T4zAWz2a17dkC2Fyzc5FgiIgKwEJFhr6Iq5Uiw==; 24:UH7IiOkUymHGXxi67NrPeg7zE1F5z0k7Q7Ih4yi6i9Enf0FQ+prBrM9du0oGxJAo3qwwvc2BO0c9DdDKRIKHmloAIjjiV0wHX7qUAi+czsQ=; 7:D3Ho+Z0PMDR29WQ2KaVkwSWyR07FJYgH4OGxAxT5JCmvfjzcBc94PRY7ndAFD5PvJ38BRGrVW4clQFqi3jaVMxdFxYqjE95cts3yIrFfrRNyhoeYaJgpWORbiGMb9XFpDEXbnCwtNv/jOSMmH4ecVzr2J7765tdJByLHysljmHBz54S0eyYXuNL6G5WUVa4q1WBYZvdWxbV/xia4/EA5JSww4NKtO9BVsAC1A423YVk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2017 20:53:52.8338 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB308 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes 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. --- gdb/ChangeLog | 5 +++++ gdb/thread.c | 15 +++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1bcc95a..e8c69f5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-09-09 Simon Marchi + + * thread.c (print_thread_info_1): Remove unnecessary calls to + uiout->is_mi_like_p. + 2017-09-09 Tom Tromey * namespace.h (add_using_directive): Update. diff --git a/gdb/thread.c b/gdb/thread.c index af7900d..2539d43 100644 --- 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);