xen: Use auto keyword as per C23

In macros it is common to declare local variables using typeof(param) in order
to ensure that side effects are only evaluated once.  A consequence of this is
double textural expansion of the parameter, which can get out of hand very
quickly with nested macros.

In C23, the auto keyword has been repurposed to perform type inference.

A GCC extension, __auto_type, is now available in the new toolchain baseline
and avoids the double textural expansion.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Nicola Vetrini <nicola.vetrini@bugseng.com>
Reviewed-by: Frediano Ziglio <frediano.ziglio@cloud.com>
This commit is contained in:
Andrew Cooper committed 2026-01-09 20:20:57 +00:00
1 parent 69e8aaf9cc
commit 6238c97ea4
6 files changed
+42 -9

No files matched your search

+5
View File
@@ -129,6 +129,11 @@ Fixed width types should only be used when a fixed width quantity is
meant (which for example may be a value read from or to be written to a meant (which for example may be a value read from or to be written to a
register). register).
Macros which otherwise would use "typeof(arg) newarg =" to avoid double
evaluation of side effects should use "auto newarg =" per it's C23 behaviour,
to also avoid double textural expansion. The use of "auto" outside of macros
is discouraged.
Especially with pointer types, whenever the pointed to object is not Especially with pointer types, whenever the pointed to object is not
(supposed to be) modified, qualify the pointed to type with "const". (supposed to be) modified, qualify the pointed to type with "const".
@@ -15,6 +15,7 @@
__alignof__, __alignof: see Sections \"6.48 Alternate Keywords\" and \"6.44 Determining the Alignment of Functions, Types or Variables\" of "GCC_MANUAL". __alignof__, __alignof: see Sections \"6.48 Alternate Keywords\" and \"6.44 Determining the Alignment of Functions, Types or Variables\" of "GCC_MANUAL".
asm, __asm__: see Sections \"6.48 Alternate Keywords\" and \"6.47 How to Use Inline Assembly Language in C Code\" of "GCC_MANUAL". asm, __asm__: see Sections \"6.48 Alternate Keywords\" and \"6.47 How to Use Inline Assembly Language in C Code\" of "GCC_MANUAL".
__attribute__: see Section \"6.39 Attribute Syntax\" of "GCC_MANUAL". __attribute__: see Section \"6.39 Attribute Syntax\" of "GCC_MANUAL".
__auto_type: see Section \"6.7 Referring to a Type with typeof\" of "GCC_MANUAL".
__builtin_offsetof: see Section \"6.53 Support for offsetof\" of "GCC_MANUAL". __builtin_offsetof: see Section \"6.53 Support for offsetof\" of "GCC_MANUAL".
__builtin_types_compatible_p: see Section \"6.59 Other Built-in Functions Provided by GCC\" of "GCC_MANUAL". __builtin_types_compatible_p: see Section \"6.59 Other Built-in Functions Provided by GCC\" of "GCC_MANUAL".
__builtin_va_arg: non-documented GCC extension. __builtin_va_arg: non-documented GCC extension.
@@ -26,6 +27,7 @@
-name_selector+={alignof, "^(__alignof__|__alignof)$"} -name_selector+={alignof, "^(__alignof__|__alignof)$"}
-name_selector+={asm, "^(__asm__|asm)$"} -name_selector+={asm, "^(__asm__|asm)$"}
-name_selector+={attribute, "^__attribute__$"} -name_selector+={attribute, "^__attribute__$"}
-name_selector+={auto_type, "^__auto_type$"}
-name_selector+={builtin_offsetof, "^__builtin_offsetof$"} -name_selector+={builtin_offsetof, "^__builtin_offsetof$"}
-name_selector+={builtin_types_p, "^__builtin_types_compatible_p$"} -name_selector+={builtin_types_p, "^__builtin_types_compatible_p$"}
-name_selector+={builtin_va_arg, "^__builtin_va_arg$"} -name_selector+={builtin_va_arg, "^__builtin_va_arg$"}
@@ -39,6 +41,7 @@
"alignof|| "alignof||
asm|| asm||
attribute|| attribute||
auto_type||
builtin_offsetof|| builtin_offsetof||
builtin_types_p|| builtin_types_p||
builtin_va_arg|| builtin_va_arg||
@@ -114,6 +117,7 @@ volatile"
-doc_end -doc_end
-doc_begin=" -doc_begin="
ext_auto_type: see Section \"6.7 Referring to a Type with typeof\" of "GCC_MANUAL".
ext_c_missing_varargs_arg: see Section \"6.21 Macros with a Variable Number of Arguments\" of "GCC_MANUAL". ext_c_missing_varargs_arg: see Section \"6.21 Macros with a Variable Number of Arguments\" of "GCC_MANUAL".
ext_enum_value_not_int: non-documented GCC extension. ext_enum_value_not_int: non-documented GCC extension.
ext_flexible_array_in_array: see Section \"6.18 Arrays of Length Zero\" of "GCC_MANUAL". ext_flexible_array_in_array: see Section \"6.18 Arrays of Length Zero\" of "GCC_MANUAL".
@@ -126,6 +130,7 @@ volatile"
ext_return_has_void_expr: see the documentation for -Wreturn-type in Section \"3.8 Options to Request or Suppress Warnings\" of "GCC_MANUAL". ext_return_has_void_expr: see the documentation for -Wreturn-type in Section \"3.8 Options to Request or Suppress Warnings\" of "GCC_MANUAL".
ext_sizeof_alignof_void_type: see Section \"6.24 Arithmetic on void- and Function-Pointers\" of "GCC_MANUAL". ext_sizeof_alignof_void_type: see Section \"6.24 Arithmetic on void- and Function-Pointers\" of "GCC_MANUAL".
" "
-name_selector+={ext_auto_type, "^ext_auto_type$"}
-name_selector+={ext_c_missing_varargs_arg, "^ext_c_missing_varargs_arg$"} -name_selector+={ext_c_missing_varargs_arg, "^ext_c_missing_varargs_arg$"}
-name_selector+={ext_enum_value_not_int, "^ext_enum_value_not_int$"} -name_selector+={ext_enum_value_not_int, "^ext_enum_value_not_int$"}
-name_selector+={ext_flexible_array_in_array, "^ext_flexible_array_in_array$"} -name_selector+={ext_flexible_array_in_array, "^ext_flexible_array_in_array$"}
@@ -139,7 +144,8 @@ volatile"
-name_selector+={ext_sizeof_alignof_void_type, "^ext_sizeof_alignof_void_type$"} -name_selector+={ext_sizeof_alignof_void_type, "^ext_sizeof_alignof_void_type$"}
-config=STD.diag,behavior+={c99,GCC_ARM64, -config=STD.diag,behavior+={c99,GCC_ARM64,
"ext_c_missing_varargs_arg|| "ext_auto_type||
ext_c_missing_varargs_arg||
ext_forward_ref_enum_def|| ext_forward_ref_enum_def||
ext_gnu_array_range|| ext_gnu_array_range||
ext_gnu_statement_expr_macro|| ext_gnu_statement_expr_macro||
@@ -149,7 +155,8 @@ ext_return_has_void_expr||
ext_sizeof_alignof_void_type" ext_sizeof_alignof_void_type"
} }
-config=STD.diag,behavior+={c99,GCC_X86_64, -config=STD.diag,behavior+={c99,GCC_X86_64,
"ext_c_missing_varargs_arg|| "ext_auto_type||
ext_c_missing_varargs_arg||
ext_enum_value_not_int|| ext_enum_value_not_int||
ext_flexible_array_in_array|| ext_flexible_array_in_array||
ext_flexible_array_in_struct|| ext_flexible_array_in_struct||
+2
View File
@@ -94,6 +94,8 @@ The table columns are as follows:
see Sections "6.48 Alternate Keywords" and "6.44 Determining the Alignment of Functions, Types or Variables" of GCC_MANUAL. see Sections "6.48 Alternate Keywords" and "6.44 Determining the Alignment of Functions, Types or Variables" of GCC_MANUAL.
__attribute__: __attribute__:
see Section "6.39 Attribute Syntax" of GCC_MANUAL. see Section "6.39 Attribute Syntax" of GCC_MANUAL.
__auto_type:
see Section "6.7 Referring to a Type with typeof" of GCC_MANUAL.
__builtin_types_compatible_p: __builtin_types_compatible_p:
see Section "6.59 Other Built-in Functions Provided by GCC" of GCC_MANUAL. see Section "6.59 Other Built-in Functions Provided by GCC" of GCC_MANUAL.
__builtin_va_arg: __builtin_va_arg:
+5
View File
@@ -599,6 +599,11 @@ Deviations related to MISRA C:2012 Rules:
- The override of the keyword \"inline\" in xen/compiler.h is present so - The override of the keyword \"inline\" in xen/compiler.h is present so
that section contents checks pass when the compiler chooses not to that section contents checks pass when the compiler chooses not to
inline a particular function. inline a particular function.
Xen does not use the \"auto\" keyword as a storage qualifier. The
override of the keyword \"auto\" in xen/compiler.h is to give it it's
C23 behaviour of type inference.
- Comment-based deviation. - Comment-based deviation.
* - R20.7 * - R20.7
+14
View File
@@ -64,6 +64,20 @@
# define asm_inline asm # define asm_inline asm
#endif #endif
/*
* In C23, the auto keyword has been repurposed to perform type inference.
*
* This behaviour is available via the __auto_type extension in supported
* toolchains.
*
* https://www.gnu.org/software/c-intro-and-ref/manual/html_node/Auto-Type.html
* https://clang.llvm.org/docs/LanguageExtensions.html#auto-type
*/
#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
/* SAF-3-safe MISRA C Rule 20.4: Giving the keyword it's C23 meaning. */
#define auto __auto_type
#endif
/* /*
* Add the pseudo keyword 'fallthrough' so case statement blocks * Add the pseudo keyword 'fallthrough' so case statement blocks
* must end with any of these keywords: * must end with any of these keywords:
+7 -7
View File
@@ -63,18 +63,18 @@
/* Hide a value from the optimiser. */ /* Hide a value from the optimiser. */
#define HIDE(x) \ #define HIDE(x) \
({ \ ({ \
typeof(x) _x = (x); \ auto _x = (x); \
asm volatile ( "" : "+r" (_x) ); \ asm volatile ( "" : "+r" (_x) ); \
_x; \ _x; \
}) })
#define ABS(x) ({ \ #define ABS(x) ({ \
typeof(x) x_ = (x); \ auto x_ = (x); \
(x_ < 0) ? -x_ : x_; \ (x_ < 0) ? -x_ : x_; \
}) })
#define SWAP(a, b) \ #define SWAP(a, b) \
do { typeof(a) t_ = (a); (a) = (b); (b) = t_; } while ( 0 ) do { auto t_ = (a); (a) = (b); (b) = t_; } while ( 0 )
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]) + __must_be_array(x)) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]) + __must_be_array(x))
@@ -104,15 +104,15 @@
*/ */
#define min(x, y) \ #define min(x, y) \
({ \ ({ \
const typeof(x) _x = (x); \ const auto _x = (x); \
const typeof(y) _y = (y); \ const auto _y = (y); \
(void)(&_x == &_y); /* typecheck */ \ (void)(&_x == &_y); /* typecheck */ \
_x < _y ? _x : _y; \ _x < _y ? _x : _y; \
}) })
#define max(x, y) \ #define max(x, y) \
({ \ ({ \
const typeof(x) _x = (x); \ const auto _x = (x); \
const typeof(y) _y = (y); \ const auto _y = (y); \
(void)(&_x == &_y); /* typecheck */ \ (void)(&_x == &_y); /* typecheck */ \
_x > _y ? _x : _y; \ _x > _y ? _x : _y; \
}) })
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.