git: bc28e9596c59 - stable/13 - Add __diagused

Mateusz Guzik mjg at FreeBSD.org
Wed Jul 21 17:00:09 UTC 2021


The branch stable/13 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc28e9596c59b58fbbdbd9f97e42a0e0fbedb855

commit bc28e9596c59b58fbbdbd9f97e42a0e0fbedb855
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-15 14:01:02 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-21 16:59:58 +0000

    Add __diagused
    
    This can be used for variables which are only used with either
    INVARIANTS or WITNESS. Without any annotation they run into dead store
    warnings from cc --analyze and always annotating with __unused may hide
    bad vars when it should not.
    
    Reviewed by:    kib, markj
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D31185
    
    (cherry picked from commit b9296725cf99696b48926270a553044522d6e344)
---
 sys/sys/systm.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index d13379b0a12f..36d48fbf080d 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -625,6 +625,13 @@ void _gone_in_dev(device_t dev, int major, const char *msg);
 #endif
 #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
+#define	__diagused	__unused
+#endif
+
 #endif /* _KERNEL */
 
 __NULLABILITY_PRAGMA_POP


More information about the dev-commits-src-all mailing list