Bug#33307865 remove sunpro-cc support

Issue
=====

devstudio is not a supported compiler anymore.

Any special handling for SUNPRO_CC can be removed.

Change
======

- remove all ifdef'ed SUNPROCC code

RB: 26948

Author: weigon

router/src/harness/include/mysql/harness/default_init_allocator.h

@@ -27,16 +27,6 @@
 
 #include <memory>
 
-#ifdef __SUNPRO_CC
-// workaround sun-cc's error
-//
-//    Error: A is not a member of A.
-//
-// for 'using A::A' by disabling the default-init adaptor and go directly to the
-// allocator itself.
-template <class T>
-using default_init_allocator = std::allocator<T>;
-#else
 /**
  * allocator which leaves newly constructed fields "default initialized".
  *
@@ -69,6 +59,5 @@ class default_init_allocator : public A {
     a_t::construct(static_cast<A &>(*this), ptr, std::forward<Args>(args)...);
   }
 };
-#endif
 
 #endif

router/src/harness/include/mysql/harness/stdx/bit.h

@@ -57,65 +57,6 @@ namespace impl {
 //    selects impl::bswap_N() with an 'if'
 // 2. impl::bswap() is automatically selected with std::if_enable_t<>
 //
-#if defined(__SUNPRO_CC)
-// Implementation works with all compilers, but is only used with devstudio.
-//
-// - gcc [
-//   2 byte: 1x rol
-//   4 byte: 1x bswap
-//   8 byte: 1x bswap
-//   ]
-// - clang [
-//   2 byte: 1x rol
-//   4 byte: 1x bswap
-//   8 byte: 1x bswap
-//   ]
-// - msvc (bad) [
-//   2 byte: 1x rol
-//   4 byte: 2x shl, 2x, shr, 3x or, 2x and
-//   8 byte: lots of shifts, or and ands
-//   ]
-// - devstudio [
-//   2 byte: 2x shift, 1 and, 1 or
-//   4 byte: 2x shl, 2x, shr, 3x or, 2x and
-//   8 byte:  lots of shifts, or and ands
-//
-
-constexpr uint8_t bswap_1(uint8_t t) noexcept { return t; }
-
-constexpr uint16_t bswap_2(uint16_t t) noexcept {
-  return (t & UINT16_C(0x00ff)) << (1 * 8) | (t & UINT16_C(0xff00)) >> (1 * 8);
-}
-
-constexpr uint32_t bswap_4(uint32_t t) noexcept {
-  return (t & UINT32_C(0x0000'00ff)) << (3 * 8) |
-         (t & UINT32_C(0x0000'ff00)) << (1 * 8) |
-         (t & UINT32_C(0x00ff'0000)) >> (1 * 8) |
-         (t & UINT32_C(0xff00'0000)) >> (3 * 8);
-}
-
-constexpr uint64_t bswap_8(uint64_t t) noexcept {
-  return (t & UINT64_C(0x0000'0000'0000'00ff)) << (7 * 8) |
-         (t & UINT64_C(0x0000'0000'0000'ff00)) << (5 * 8) |
-         (t & UINT64_C(0x0000'0000'00ff'0000)) << (3 * 8) |
-         (t & UINT64_C(0x0000'0000'ff00'0000)) << (1 * 8) |
-         (t & UINT64_C(0x0000'00ff'0000'0000)) >> (1 * 8) |
-         (t & UINT64_C(0x0000'ff00'0000'0000)) >> (3 * 8) |
-         (t & UINT64_C(0x00ff'0000'0000'0000)) >> (5 * 8) |
-         (t & UINT64_C(0xff00'0000'0000'0000)) >> (7 * 8);
-}
-
-template <class T>
-constexpr std::enable_if_t<
-    sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8, T>
-bswap(T t) noexcept {
-  if (1 == sizeof(t)) return bswap_1(t);
-  if (2 == sizeof(t)) return bswap_2(t);
-  if (4 == sizeof(t)) return bswap_4(t);
-  if (8 == sizeof(t)) return bswap_8(t);
-}
-
-#else  // __SUNPRO_CC
 // implementation for
 //
 // - gcc [
@@ -143,11 +84,6 @@ bswap(T t) noexcept {
 // MSVC provides _byteswap_uint64() and friends as instrincts, but they aren't
 // marked as constexpr.
 //
-// with devstudio it fails with:
-//
-//   Error: std::enable_if_t<sizeof((T))==1, T> stdx::impl::bswap<T>(T) already
-//   had a body defined.
-//
 template <class T>
 constexpr std::enable_if_t<sizeof(T) == 1, T> bswap(T t) noexcept {
   return t;
@@ -197,7 +133,6 @@ constexpr std::enable_if_t<sizeof(T) == 8, T> bswap(T t) noexcept {
          (t & UINT64_C(0xff00'0000'0000'0000)) >> (7 * 8);
 #endif
 }
-#endif  // __SUNPRO_CC
 
 }  // namespace impl
 

router/src/harness/src/sd_notify.cc

@@ -115,13 +115,7 @@ connect_to_notify_socket(net::io_context &io_ctx,
 
       // stay in the loop in case we got interrupted.
     } else {
-#if defined(__SUNPRO_CC)
-      // suncc needs a std::move(), while gcc complains about redundant
-      // std::move().
-      return std::move(sock);
-#else
       return sock;
-#endif
     }
   } while (true);
 }

router/src/harness/tests/test_net_ts_io_context.cc

@@ -576,9 +576,6 @@ TEST(NetTS_io_context, executor_defer_called_once) {
   ASSERT_EQ(global_called, 1);
 }
 
-#if !defined(__SUNPRO_CC)
-// sunproc can't generate move-only lambda's
-
 /**
  * test that net::defer() compiles with move only lambdas.
  */
@@ -604,7 +601,6 @@ TEST(NetTS_io_context, executor_defer_move_only_lambda) {
   ASSERT_EQ(0, io_ctx.run_one());
   ASSERT_EQ(called, 1);
 }
-#endif
 
 // net::is_executor_v<> chokes with solaris-ld on
 //

router/src/router/src/common/mysql_session.cc

@@ -304,12 +304,7 @@ MySQLSession::real_query(const std::string &q) {
     return stdx::make_unexpected(make_mysql_error_code(connection_));
   }
 
-#if defined(__SUNPRO_CC)
-  // ensure sun-cc doesn't try to the copy-constructor on a move-only type
-  return std::move(res);
-#else
   return res;
-#endif
 }
 
 stdx::expected<MySQLSession::mysql_result_type, MysqlError>

router/src/router/src/config_generator.cc

@@ -492,13 +492,7 @@ static stdx::expected<std::ofstream, std::error_code> open_ofstream(
         std::error_code{errno, std::generic_category()});
   }
 
-#ifdef __SUNPRO_CC
-  // make sure sun-cc uses the move-constructor (and not the non-existant
-  // copy-constructor)
-  return {std::move(of)};
-#else
   return of;
-#endif
 }
 
 void ConfigGenerator::bootstrap_system_deployment(

router/src/routing/tests/test_routing.cc

@@ -248,14 +248,6 @@ class MockServer {
   std::atomic_bool stop_;
 };
 
-// sunpro tries to invoke the disabled copy-constructor of sock.
-// while GCC complains about "redundant move in return statement".
-#if defined(__SUNPRO_CC)
-#define WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(x) std::move(x)
-#else
-#define WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(x) (x)
-#endif
-
 static stdx::expected<net::ip::tcp::socket, std::error_code> connect_tcp(
     net::io_context &io_ctx, const std::string &host, uint16_t port,
     std::chrono::milliseconds connect_timeout) {
@@ -302,7 +294,7 @@ static stdx::expected<net::ip::tcp::socket, std::error_code> connect_tcp(
           } else {
             // success, we can continue
             sock.native_non_blocking(false);
-            return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+            return sock;
           }
         }
       } else {
@@ -312,7 +304,7 @@ static stdx::expected<net::ip::tcp::socket, std::error_code> connect_tcp(
       // everything is fine, we are connected
       sock.native_non_blocking(false);
 
-      return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+      return sock;
     }
 
     // it failed, try the next address
@@ -364,7 +356,7 @@ connect_socket(net::io_context &io_ctx,
     return stdx::make_unexpected(socket_res.error());
   }
 
-  return WORKAROUND_RETURN_NON_COPYABLE_EXPECTED(sock);
+  return sock;
 }
 #endif