[PATCH] libstdc++: Avoid use of naked int32_t in unseq_backend_simd.h, PR108672

[PATCH] libstdc++: Avoid use of naked int32_t in unseq_backend_simd.h, PR108672

[Hans-Peter Nilsson]

Tested cris-elf and native x86_64-pc-linux-gnu.
Ok to commit?

---- 8< ----
The use of a "naked" int32_t (i.e. without a fitting #include:
stdint.h or cstdint or inttypes.h or an equivalent internal header),
in libstdc++-v3/include/pstl/unseq_backend_simd.h, caused an error for
cris-elf and apparently pru-elf and I guess all "newlib targets".
(Unfortunately, there's a lack of other *-elf targets in recent months
of gcc-testresults archives.)

This does not manifest on e.g. native x86_64-pc-linux-gnu, because
there, a definition is included as an effect of including stdlib.h in
cstdlib (following the trace in native xtreme-header-2_a.ii with
glibc-2.31-13+deb11u5).  Maybe better than chasing the right #includes
is to directly use the built-in type, like so:

libstdc++-v3:

	PR libstdc++/108672
	* include/pstl/unseq_backend_simd.h (__simd_or): Use __INT32_TYPE__
	instead of int32_t.
---
 libstdc++-v3/include/pstl/unseq_backend_simd.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/pstl/unseq_backend_simd.h b/libstdc++-v3/include/pstl/unseq_backend_simd.h
index a05de39f7576..f6265f5c16e5 100644
--- a/libstdc++-v3/include/pstl/unseq_backend_simd.h
+++ b/libstdc++-v3/include/pstl/unseq_backend_simd.h
@@ -74,7 +74,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept
     const _Index __last = __first + __n;
     while (__last != __first)
     {
-        int32_t __flag = 1;
+        __INT32_TYPE__ __flag = 1;
         _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag)
         for (_DifferenceType __i = 0; __i < __block_size; ++__i)
             if (__pred(*(__first + __i)))
-- 
2.30.2

Re: [PATCH] libstdc++: Avoid use of naked int32_t in unseq_backend_simd.h, PR108672

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 1999 bytes --]

On Sat, 4 Feb 2023, 03:20 Hans-Peter Nilsson via Libstdc++, <
libstdc++@gcc.gnu.org> wrote:

> Tested cris-elf and native x86_64-pc-linux-gnu.
> Ok to commit?
>

Yes, we already do this with other stdint.h types when we don't want to
include stdint.h if we don't *really* need all of it.

OK, thanks.



> ---- 8< ----
> The use of a "naked" int32_t (i.e. without a fitting #include:
> stdint.h or cstdint or inttypes.h or an equivalent internal header),
> in libstdc++-v3/include/pstl/unseq_backend_simd.h, caused an error for
> cris-elf and apparently pru-elf and I guess all "newlib targets".
> (Unfortunately, there's a lack of other *-elf targets in recent months
> of gcc-testresults archives.)
>
> This does not manifest on e.g. native x86_64-pc-linux-gnu, because
> there, a definition is included as an effect of including stdlib.h in
> cstdlib (following the trace in native xtreme-header-2_a.ii with
> glibc-2.31-13+deb11u5).  Maybe better than chasing the right #includes
> is to directly use the built-in type, like so:
>
> libstdc++-v3:
>
>         PR libstdc++/108672
>         * include/pstl/unseq_backend_simd.h (__simd_or): Use __INT32_TYPE__
>         instead of int32_t.
> ---
>  libstdc++-v3/include/pstl/unseq_backend_simd.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libstdc++-v3/include/pstl/unseq_backend_simd.h
> b/libstdc++-v3/include/pstl/unseq_backend_simd.h
> index a05de39f7576..f6265f5c16e5 100644
> --- a/libstdc++-v3/include/pstl/unseq_backend_simd.h
> +++ b/libstdc++-v3/include/pstl/unseq_backend_simd.h
> @@ -74,7 +74,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred
> __pred) noexcept
>      const _Index __last = __first + __n;
>      while (__last != __first)
>      {
> -        int32_t __flag = 1;
> +        __INT32_TYPE__ __flag = 1;
>          _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag)
>          for (_DifferenceType __i = 0; __i < __block_size; ++__i)
>              if (__pred(*(__first + __i)))
> --
> 2.30.2
>
>