From 2c874d2128e35bb38817f349cfdfe9eca7281c9d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 16 May 2023 14:53:03 -0700 Subject: [PATCH] [libc] Fix definition and use of LIBC_INLINE macro LIBC_INLINE was doubly defined in two headers. Define it only in one place. Also update a few uses to make sure it's always placed where a function attribute is valid and is used consistently on every declaration of the same function in case the attributes used in its definition must match on declarations and definitions. Reviewed By: abrachet Differential Revision: https://reviews.llvm.org/D150731 --- libc/src/__support/endian.h | 4 ++-- libc/src/__support/macros/config.h | 2 -- libc/src/__support/macros/optimization.h | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libc/src/__support/endian.h b/libc/src/__support/endian.h index 1bdccd8..cc4eaa2 100644 --- a/libc/src/__support/endian.h +++ b/libc/src/__support/endian.h @@ -32,8 +32,8 @@ namespace internal { template struct Endian { static constexpr const bool IS_LITTLE = ORDER == __ORDER_LITTLE_ENDIAN__; static constexpr const bool IS_BIG = ORDER == __ORDER_BIG_ENDIAN__; - template static T to_big_endian(T value); - template static T to_little_endian(T value); + template LIBC_INLINE static T to_big_endian(T value); + template LIBC_INLINE static T to_little_endian(T value); }; // Little Endian specializations diff --git a/libc/src/__support/macros/config.h b/libc/src/__support/macros/config.h index 3aeac32..dcc4a30 100644 --- a/libc/src/__support/macros/config.h +++ b/libc/src/__support/macros/config.h @@ -13,8 +13,6 @@ #ifndef LLVM_LIBC_SUPPORT_MACROS_CONFIG_H #define LLVM_LIBC_SUPPORT_MACROS_CONFIG_H -#define LIBC_INLINE inline - // LIBC_HAS_BUILTIN() // // Checks whether the compiler supports a Clang Feature Checking Macro, and if diff --git a/libc/src/__support/macros/optimization.h b/libc/src/__support/macros/optimization.h index 707ecd4..ba44410 100644 --- a/libc/src/__support/macros/optimization.h +++ b/libc/src/__support/macros/optimization.h @@ -10,6 +10,7 @@ #ifndef LLVM_LIBC_SRC_SUPPORT_MACROS_OPTIMIZATION_H #define LLVM_LIBC_SRC_SUPPORT_MACROS_OPTIMIZATION_H +#include "src/__support/macros/attributes.h" // LIBC_INLINE #include "src/__support/macros/config.h" // LIBC_HAS_BUILTIN #include "src/__support/macros/properties/compiler.h" // LIBC_COMPILER_IS_CLANG @@ -17,7 +18,7 @@ // accidentally pass an integer. namespace __llvm_libc::details { template -constexpr LIBC_INLINE bool expects_bool_condition(T value, T expected) { +LIBC_INLINE constexpr bool expects_bool_condition(T value, T expected) { return __builtin_expect(value, expected); } } // namespace __llvm_libc::details -- 2.7.4