From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 714473836C73 for ; Mon, 19 Oct 2020 16:05:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 714473836C73 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sebastian.huber@embedded-brains.de Received: from sslproxy02.your-server.de ([78.47.166.47]) by dedi548.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1kUXf1-0004Oi-FI for newlib@sourceware.org; Mon, 19 Oct 2020 18:05:23 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1kUXf1-0002m6-CC for newlib@sourceware.org; Mon, 19 Oct 2020 18:05:23 +0200 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 117302A1610 for ; Mon, 19 Oct 2020 18:04:11 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ol7FIUt2j8cb for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 88AED2A1682 for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id lVg2U7TE5pTD for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) Received: from linux-diu0.suse (unknown [192.168.96.161]) by mail.embedded-brains.de (Postfix) with ESMTP id 7051B2A1687 for ; Mon, 19 Oct 2020 18:04:10 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Subject: [PATCH 05/11] Remove from RB_REMOVE_COLOR some null checks Date: Mon, 19 Oct 2020 18:05:18 +0200 Message-Id: <20201019160522.15408-6-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201019160522.15408-1-sebastian.huber@embedded-brains.de> References: <20201019160522.15408-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.102.4/25962/Mon Oct 19 15:57:02 2020) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 16:05:25 -0000 From: dougm where the pointer checked is provably never null. Restructure the surroun= ding code just enough to make the non-nullness obvious. Reviewed by: markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D25089 --- newlib/libc/include/sys/tree.h | 46 +++++++++++++++------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/newlib/libc/include/sys/tree.h b/newlib/libc/include/sys/tre= e.h index d5adfdd4e..372c001b9 100644 --- a/newlib/libc/include/sys/tree.h +++ b/newlib/libc/include/sys/tree.h @@ -493,26 +493,23 @@ name##_RB_REMOVE_COLOR(struct name *head, struct ty= pe *parent) \ RB_ROTATE_LEFT(head, parent, tmp, field);\ tmp =3D RB_RIGHT(parent, field); \ } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field) && \ - !RB_ISRED(RB_RIGHT(tmp, field), field)) { \ - RB_COLOR(tmp, field) =3D RB_RED; \ - elm =3D parent; \ - parent =3D RB_PARENT(elm, field); \ - continue; \ - } \ - if (!RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + if (RB_ISRED(RB_LEFT(tmp, field), field)) { \ struct type *oleft; \ - if ((oleft =3D RB_LEFT(tmp, field)) \ - !=3D NULL) \ - RB_COLOR(oleft, field) =3D RB_BLACK; \ + oleft =3D RB_LEFT(tmp, field); \ + RB_COLOR(oleft, field) =3D RB_BLACK; \ RB_COLOR(tmp, field) =3D RB_RED; \ RB_ROTATE_RIGHT(head, tmp, oleft, field); \ tmp =3D RB_RIGHT(parent, field); \ + } else if (!RB_ISRED(RB_RIGHT(tmp, field), field)) { \ + RB_COLOR(tmp, field) =3D RB_RED; \ + elm =3D parent; \ + parent =3D RB_PARENT(elm, field); \ + continue; \ } \ + if (RB_ISRED(RB_RIGHT(tmp, field), field)) \ + RB_COLOR(RB_RIGHT(tmp, field), field) =3D RB_BLACK; \ RB_COLOR(tmp, field) =3D RB_COLOR(parent, field); \ RB_COLOR(parent, field) =3D RB_BLACK; \ - if (RB_RIGHT(tmp, field)) \ - RB_COLOR(RB_RIGHT(tmp, field), field) =3D RB_BLACK; \ RB_ROTATE_LEFT(head, parent, tmp, field); \ elm =3D RB_ROOT(head); \ break; \ @@ -523,26 +520,23 @@ name##_RB_REMOVE_COLOR(struct name *head, struct ty= pe *parent) \ RB_ROTATE_RIGHT(head, parent, tmp, field);\ tmp =3D RB_LEFT(parent, field); \ } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field) && \ - !RB_ISRED(RB_RIGHT(tmp, field), field)) { \ - RB_COLOR(tmp, field) =3D RB_RED; \ - elm =3D parent; \ - parent =3D RB_PARENT(elm, field); \ - continue; \ - } \ - if (!RB_ISRED(RB_LEFT(tmp, field), field)) { \ + if (RB_ISRED(RB_RIGHT(tmp, field), field)) { \ struct type *oright; \ - if ((oright =3D RB_RIGHT(tmp, field)) \ - !=3D NULL) \ - RB_COLOR(oright, field) =3D RB_BLACK; \ + oright =3D RB_RIGHT(tmp, field); \ + RB_COLOR(oright, field) =3D RB_BLACK; \ RB_COLOR(tmp, field) =3D RB_RED; \ RB_ROTATE_LEFT(head, tmp, oright, field); \ tmp =3D RB_LEFT(parent, field); \ + } else if (!RB_ISRED(RB_LEFT(tmp, field), field)) { \ + RB_COLOR(tmp, field) =3D RB_RED; \ + elm =3D parent; \ + parent =3D RB_PARENT(elm, field); \ + continue; \ } \ + if (RB_ISRED(RB_LEFT(tmp, field), field)) \ + RB_COLOR(RB_LEFT(tmp, field), field) =3D RB_BLACK; \ RB_COLOR(tmp, field) =3D RB_COLOR(parent, field); \ RB_COLOR(parent, field) =3D RB_BLACK; \ - if (RB_LEFT(tmp, field)) \ - RB_COLOR(RB_LEFT(tmp, field), field) =3D RB_BLACK; \ RB_ROTATE_RIGHT(head, parent, tmp, field); \ elm =3D RB_ROOT(head); \ break; \ --=20 2.26.2