From nobody Wed Apr 27 13:58:54 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DB33E1996DFB; Wed, 27 Apr 2022 13:58:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpL2R5vyPz3GQK; Wed, 27 Apr 2022 13:58:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651067935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xhIU3KCPj76MIjno8YZXoK5fZY8qzuygm3C7uu5GPuc=; b=Z/xWnczsVjmb3dkQhQ4LmfdQ+0HL0nlj2FS6gNIUdFrCNxPhvaCs8dnDazY9kct9XZEuey KEIprK4gjK9s2dm6b/trD19wMI8hs6UXF8BWWFzBkj117Lx+BlrZcQkz9ovuhHrpEVZgv6 jAvN4qH0s6WigJyi2DaQBCIDaWK/hOtv8stEA358u1vIeB04XDTmT6Jf3kTOtEDP4pNeZP HNHE1LU8bKZ1FgVe34KKWBGdznj8RvRIoqmoZ9OenLj2wyfbpLhe87oySfhMJuumWoKP0F k29W9I9HPd0kJ22W990lhmQ0aY8+xjh1fLXpO6Gq16+gixIrReDOgmAfGTNCxw== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 2F94891CC; Wed, 27 Apr 2022 13:58:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0dbcc859-69b1-4850-11c3-f8a4acf5bde9@FreeBSD.org> Date: Wed, 27 Apr 2022 06:58:54 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: git: b40c0db6f6d6 - main - Patch up __diagused for when only one of INVARIANTS or WITNESS is defined Content-Language: en-US To: Mateusz Guzik , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202204271330.23RDUHwN063641@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202204271330.23RDUHwN063641@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651067935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xhIU3KCPj76MIjno8YZXoK5fZY8qzuygm3C7uu5GPuc=; b=LJEbKzpjmK6/TOADc0Rcdb+MY54SieK2cKAR2d1+/Jel9mkVPnFHxJhKb86iZpZ6ALU07u N4EUZLvnwnvyhh09TMO9yAH0oFrcLoOL57zMVOyqPkBxMO7Pa60x1eYVJ+sYuFCbxlkEAN z47vfxMXJQeaexA28M+epmQzfkgenVhqWVwN6754I+ODkkAAj3/rEhmAGWH470XugkPD8n mAgRmqs+qY4AtVozvuhEQEcoHKW7gglI46GxuErOptGywF7PFz1/CHfEBfR53coFw/cQfw 89Zr8Rjp5zwOVMYV0qYPz23UojTLHQyysdOv7VkeVHKVVC3k118Uhs9hbiJq9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651067935; a=rsa-sha256; cv=none; b=VejQdgjYc0PMkg3MkuLIgPLXIhAX55yNFQZR+KPTMiyqAZtUZyo7lc8bgMzp+HpD1AgoWd U9n1fG1W3CkAdePqjBdA7381l7oz8KUzp55j6rnjMtM8qHMGc1BZYWToJl4g1wClDeEloq /Fs5aJpJeiYCwuqr48H3CczTjDlQ0FZkERGqGZY8avpqOUMza8TRCH5O2VuxeEJJlF1On5 1uYxdXZ7OSCxWUPj0749Pa/13t6k+jXeDzro3g4qI3ZLwnNPh32RbeQX0D8rM+3B+GWM0W LzxkqnMKBosVe7SrtRARQDF8HYZ8HL+f/os1BRWGLgN6lhzWdJX/dZ1fYDb1sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 4/27/22 6:30 AM, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b40c0db6f6d61ed594118d81dc691b9263a7e4d7 > > commit b40c0db6f6d61ed594118d81dc691b9263a7e4d7 > Author: Mateusz Guzik > AuthorDate: 2022-04-27 13:29:12 +0000 > Commit: Mateusz Guzik > CommitDate: 2022-04-27 13:29:12 +0000 > > Patch up __diagused for when only one of INVARIANTS or WITNESS is defined > > Reported by: John F Carr > --- > sys/sys/systm.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/sys/sys/systm.h b/sys/sys/systm.h > index f2ffa7e6b815..6ca9ee886562 100644 > --- a/sys/sys/systm.h > +++ b/sys/sys/systm.h > @@ -554,10 +554,13 @@ void _gone_in_dev(device_t dev, int major, const char *msg); > #define gone_in(major, msg) __gone_ok(major, msg) _gone_in(major, msg) > #define gone_in_dev(dev, major, msg) __gone_ok(major, msg) _gone_in_dev(dev, major, msg) > > -#if defined(INVARIANTS) || defined(WITNESS) > -#define __diagused > -#else > +#if !defined(INVARIANTS) && !defined(WITNESS) > +#define __diagused __unused > +#elif ((defined(INVARIANTS) && !defined(WITNESS)) || \ > + (!defined(INVARIANTS) && defined(WITNESS))) > #define __diagused __unused > +#else > +#define __diagused > #endif Hmm, could this just be: #if defined(INVARIANTS) && defined(WITNESS) #define __diagused #else #define __diagused __unused #endif (That is, just change the || to && in the original version?) -- John Baldwin