Use C2x [[fallthrough]] when supported by LLVM/clang

Clang added support for the gcc-style fallthrough
attribute (i.e. __attribute__((fallthrough))) in version 10.  However,
__has_attribute(fallthrough) will return 1 in C mode in older versions,
even though they only support the C++11 fallthrough attribute. At best,
the unsupported attribute is simply ignored; at worst, it causes errors.

The C2x fallthrough attribute has the advantages of being supported in
the broadest range of clang versions (added in version 9) and being easy
to check for support. Use C2x [[fallthrough]] attribute if possible, and
fall back to not using an attribute for clang versions that don't have
it.

Courtesy of Joshua Root

(cherry picked from commit 14c8d4386397adbb826e94c4dfe9b7364dab8c75)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 63d3af340c4ea3cc6a62c717d903b6636a7509ca..e94ac3500e875693a6ee241566ba591e86573f11 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -35,6 +35,10 @@
 #define __has_attribute(x) 0
 #endif /* if !defined(__has_attribute) */
 
+#if !defined(__has_c_attribute)
+#define __has_c_attribute(x) 0
+#endif /* if !defined(__has_c_attribute) */
+
 #if !defined(__has_feature)
 #define __has_feature(x) 0
 #endif /* if !defined(__has_feature) */
@@ -61,7 +65,9 @@
 #define ISC_NONSTRING
 #endif /* __GNUC__ */
 
-#if __GNUC__ >= 7 || __has_attribute(fallthrough)
+#if __has_c_attribute(fallthrough)
+#define FALLTHROUGH [[fallthrough]]
+#elif __GNUC__ >= 7 && !defined(__clang__)
 #define FALLTHROUGH __attribute__((fallthrough))
 #else
 /* clang-format off */