From 4e9868d4e0c8e45505876901d22c021dd36972a8 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 5 Apr 2017 15:15:59 -0400 Subject: [PATCH] ptid_{lwp,tid}_p: Remove unnecessary checks The calls to ptid_equal in ptid_lwp_p and ptid_tid_p that compare the argument to minus_one_ptid and null_ptid are not necessary. The calls in question are: if (ptid_equal (minus_one_ptid, ptid) || ptid_equal (null_ptid, ptid)) return 0; minus_one_ptid is { .pid = -1, .lwp = 0, .tid = 0 } null_ptid is { .pid = 0, .lwp = 0, .tid = 0 } If the ptid argument is either of them, the statements return (ptid_get_lwp (ptid) != 0); and return (ptid_get_tid (ptid) != 0); will yield the same result (0/false). gdb/ChangeLog: * common/ptid.c (ptid_lwp_p, ptid_tid_p): Remove comparison with minus_one_ptid and null_ptid. --- gdb/ChangeLog | 5 +++++ gdb/common/ptid.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d21436c8d65..880af5b8c93 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-04-05 Simon Marchi + + * common/ptid.c (ptid_lwp_p, ptid_tid_p): Remove comparison with + minus_one_ptid and null_ptid. + 2017-04-05 Pedro Alves * warning.m4 (build_warnings): Remove -Wno-write-strings. diff --git a/gdb/common/ptid.c b/gdb/common/ptid.c index 05c0db17ddf..b56971b9af2 100644 --- a/gdb/common/ptid.c +++ b/gdb/common/ptid.c @@ -97,10 +97,6 @@ ptid_is_pid (ptid_t ptid) int ptid_lwp_p (ptid_t ptid) { - if (ptid_equal (minus_one_ptid, ptid) - || ptid_equal (null_ptid, ptid)) - return 0; - return (ptid_get_lwp (ptid) != 0); } @@ -109,10 +105,6 @@ ptid_lwp_p (ptid_t ptid) int ptid_tid_p (ptid_t ptid) { - if (ptid_equal (minus_one_ptid, ptid) - || ptid_equal (null_ptid, ptid)) - return 0; - return (ptid_get_tid (ptid) != 0); } -- 2.30.2