[libc++][NFC] Remove clang-diagnostic-c++98-compat-extra-semi warnings in experimental/simd

[philnik]

Summary

Force semicolons or remove them in experimental/simd

[• Quuxplusone]

LGTM mod important alteration. Let's not introduce _LIBCPP_FORCE_SEMICOLON since it's trivial to avoid.

libcxx/include/experimental/simd

773

[philnik]

libcxx/include/experimental/simd

773

These semicolons aren't actually required either, so this won't work.

[• Quuxplusone]

libcxx/include/experimental/simd

773

Based on the definition of the macro on line 734, either your solution or mine should work to suppress unnecessary-semicolon diagnostics.
However, it would be even simpler to make the semicolon part of the macro itself:

#define _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, _NUM_ELEMENT)                        \
  template <>                                                                  \
  struct __vec_ext_traits<_TYPE, sizeof(_TYPE) * _NUM_ELEMENT> {               \
    using type =                                                               \
        _TYPE __attribute__((vector_size(sizeof(_TYPE) * _NUM_ELEMENT)));      \
  };

and then

#define _LIBCPP_SPECIALIZE_VEC_EXT_32(_TYPE)                                   \
  _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 1)                                         \
  _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 2)                                         \
  _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 3)                                         \
  ~~~

_LIBCPP_SPECIALIZE_VEC_EXT_32(char)
_LIBCPP_SPECIALIZE_VEC_EXT_32(char16_t)
_LIBCPP_SPECIALIZE_VEC_EXT_32(char32_t)
~~~

That should definitely satisfy whatever semicolon-checker is complaining.

[philnik]

• Remove _LIBCPP_FORCE_SEMICOLON

libcxx/include/experimental/simd

773

Sorry, I missed that it's a struct and not a template function.

[Mordante]

LGTM!

[ldionne]

Why are we not adding or removing any flag in this patch?

[philnik]

In D117157#3241395, @ldionne wrote:

Why are we not adding or removing any flag in this patch?

This is a clang-tidy check which is already enabled. We just don't run clang-tidy yet.

[ldionne]

In D117157#3241622, @philnik wrote:

In D117157#3241395, @ldionne wrote:

Why are we not adding or removing any flag in this patch?

This is a clang-tidy check which is already enabled. We just don't run clang-tidy yet.

Thanks for explaining.

libcxx/include/experimental/simd

class __simd_storage<_Tp, __simd_abi<_StorageKind::_Array, __num_element>> {
 
   template <class, class>
   friend struct simd;
 
   template <class, class>
   friend struct simd_mask;
 
 public:
-  _Tp __get(size_t __index) const noexcept { return __storage_[__index]; };
+  _Tp __get(size_t __index) const noexcept { return __storage_[__index]; }
   void __set(size_t __index, _Tp __val) noexcept {
     __storage_[__index] = __val;
   }
 };
 
 template <class _Tp>
 class __simd_storage<_Tp, __simd_abi<_StorageKind::_Scalar, 1>> {
   _Tp __storage_;
 
   template <class, class>
   friend struct simd;
 
   template <class, class>
   friend struct simd_mask;
 
 public:
-  _Tp __get(size_t __index) const noexcept { return (&__storage_)[__index]; };
+  _Tp __get(size_t __index) const noexcept { return (&__storage_)[__index]; }
   void __set(size_t __index, _Tp __val) noexcept {
     (&__storage_)[__index] = __val;
   }
 };
 
 #ifndef _LIBCPP_HAS_NO_VECTOR_EXTENSION
 
 constexpr size_t __floor_pow_of_2(size_t __val) {
#define _LIBCPP_SPECIALIZE_VEC_EXT_32(_TYPE)                                   \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 24);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 25);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 26);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 27);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 28);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 29);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 30);                                       \
   _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 31);                                       \
-  _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 32);
+  _LIBCPP_SPECIALIZE_VEC_EXT(_TYPE, 32)
 
 _LIBCPP_SPECIALIZE_VEC_EXT_32(char);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(char16_t);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(char32_t);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(wchar_t);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(signed char);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(signed short);
 _LIBCPP_SPECIALIZE_VEC_EXT_32(signed int);
class __simd_storage<_Tp, __simd_abi<_StorageKind::_VecExt, __num_element>> {
 
   template <class, class>
   friend struct simd;
 
   template <class, class>
   friend struct simd_mask;
 
 public:
-  _Tp __get(size_t __index) const noexcept { return __storage_[__index]; };
+  _Tp __get(size_t __index) const noexcept { return __storage_[__index]; }
   void __set(size_t __index, _Tp __val) noexcept {
     __storage_[__index] = __val;
   }
 };
 
 #endif // _LIBCPP_HAS_NO_VECTOR_EXTENSION
 
 template <class _Vp, class _Tp, class _Abi>