Bug#35599871 Compile MySQL with clang 16

Fix Clang 16 warnings, most of them windows specific:

Silence -Wno-microsoft-template warning.
Silence -Wno-deprecated-non-prototype for SunRPC code.

Fix a couple of -Wunused-but-set-variable warnings.
These are also visible with Clang 16 in RelWithDebInfo mode on Linux.

mysql_routing.h fix -Wdeprecated-copy-with-user-provided-dtor

Work around pragma push/pop error.

Use __has_trivial_constructor for Visual studio only, not for clang.

Silence some more warnings in 3rd party libevent code.

Change-Id: Ie56452e183633df403d5f3cadf3cc458d849b2f3

Author: Tor Didriksen

client/CMakeLists.txt

@@ -240,6 +240,13 @@ SET(MYSQLBINLOG_SOURCES
   ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc
   )
 
+# duplicate explicit instantiation of 'net_field_length_checked'
+# ignored as a Microsoft extension
+IF(WIN32_CLANG)
+  ADD_COMPILE_FLAGS(${CMAKE_SOURCE_DIR}/sql/log_event.cc
+    COMPILE_FLAGS " -Wno-microsoft-template")
+ENDIF()
+
 SET(MYSQLBINLOG_LIBRARIES
   mysql_binlog_event
   client_base

extra/libevent/libevent-2.1.11-stable/CMakeLists.txt

@@ -43,6 +43,8 @@ ENDIF()
 IF(WIN32_CLANG)
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-assign-enum")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-cast-align")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-cast-function-type")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-cast-function-type-strict")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-cast-qual")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-covered-switch-default")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-disabled-macro-expansion")
@@ -64,8 +66,12 @@ IF(WIN32_CLANG)
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-shadow")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-sign-conversion")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-shorten-64-to-32")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-strict-prototypes")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-switch-enum")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-unreachable-code-fallthrough")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-unreachable-code-return")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-unsafe-buffer-usage")
+  STRING_APPEND(CMAKE_C_FLAGS " -Wno-unused-but-set-variable")
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-unused-macros")
 ENDIF()
 

plugin/group_replication/libmysqlgcs/CMakeLists.txt

@@ -173,6 +173,13 @@ IF(MSVC)
       COMPILE_FLAGS
       "-Wno-unused-function"
       )
+    # clang has this, but clang++ does not.
+    MY_CHECK_C_COMPILER_FLAG("-Wdeprecated-non-prototype"
+      HAS_DEPRECATED_NON_PROTOTYPE)
+    IF(HAS_DEPRECATED_NON_PROTOTYPE)
+      ADD_COMPILE_FLAGS(${XCOM_SUNRPC_SOURCES} ${XCOM_RPCGEN_SOURCES}
+        COMPILE_FLAGS "-Wno-deprecated-non-prototype")
+    ENDIF()
   ELSE()
     ADD_COMPILE_FLAGS(${XCOM_SUNRPC_SOURCES} ${XCOM_RPCGEN_SOURCES}
       COMPILE_FLAGS "/wd4018")

plugin/group_replication/libmysqlgcs/cmake/rpcgen.cmake

@@ -41,6 +41,16 @@ IF(WIN32)
     ${XCOM_BASEDIR}/windeps/sunrpc/xdr.c
     )
 
+  IF(WIN32_CLANG)
+    # clang has this, but clang++ does not.
+    MY_CHECK_C_COMPILER_FLAG("-Wdeprecated-non-prototype"
+      HAS_DEPRECATED_NON_PROTOTYPE)
+    IF(HAS_DEPRECATED_NON_PROTOTYPE)
+      ADD_COMPILE_FLAGS(${SUNRPC_SRCS}
+        COMPILE_FLAGS "-Wno-deprecated-non-prototype")
+    ENDIF()
+  ENDIF()
+
   # /wd4311 'type cast': pointer truncation from 'const caddr_t' to 'u_long'
   # /wd4312 'type cast': conversion from 'long' to 'void *' of greater size
   ADD_COMPILE_FLAGS(

plugin/group_replication/src/plugin_variables/recovery_endpoints.cc

@@ -122,7 +122,6 @@ int Recovery_endpoints::local_interfaces_ips(std::set<std::string> &local_ips) {
   DBUG_TRACE;
 
   ULONG flags = GAA_FLAG_INCLUDE_PREFIX, family = AF_UNSPEC, out_buflen = 0;
-  DWORD retval = 0;
   PIP_ADAPTER_ADDRESSES addresses;
   PIP_ADAPTER_ADDRESSES curr_addresses;
 
@@ -133,7 +132,7 @@ int Recovery_endpoints::local_interfaces_ips(std::set<std::string> &local_ips) {
     return 1;
   }
 
-  retval = GetAdaptersAddresses(family, flags, nullptr, addresses, &out_buflen);
+  GetAdaptersAddresses(family, flags, nullptr, addresses, &out_buflen);
 
   curr_addresses = addresses;
 

router/src/mock_server/src/CMakeLists.txt

@@ -61,6 +61,11 @@ SET(MOCK_SERVER_HTTP_CLIENT_SRCS
     mock_server_rest_client.cc)
 
 # disable compiler warnings in duktape
+MY_CHECK_CXX_COMPILER_WARNING("-Wunused-but-set-variable" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  ADD_COMPILE_FLAGS(${DUKTAPE_SRCS} COMPILE_FLAGS "${HAS_WARN_FLAG}")
+ENDIF()
+
 MY_CHECK_CXX_COMPILER_WARNING("-Wunused-function" HAS_WARN_FLAG)
 IF(HAS_WARN_FLAG)
   ADD_COMPILE_FLAGS(${DUKTAPE_SRCS} COMPILE_FLAGS "${HAS_WARN_FLAG}")

router/src/routing/src/mysql_routing.h

@@ -95,6 +95,8 @@ class ROUTING_EXPORT AcceptingEndpoint {
                     const std::string &parent_routing_name)
       : io_ctx_(io_ctx), parent_routing_name_(parent_routing_name) {}
 
+  AcceptingEndpoint(const AcceptingEndpoint &) = delete;
+
   virtual stdx::expected<void, std::error_code> setup() = 0;
   virtual stdx::expected<void, std::error_code> cancel() = 0;
   virtual bool is_open() const = 0;

sql-common/client.cc

@@ -514,7 +514,7 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
   HANDLE handle_file_map = NULL;
   HANDLE connect_named_mutex = NULL;
   ulong connect_number;
-  char connect_number_char[22], *p;
+  char connect_number_char[22];
   char *tmp = NULL;
   char *suffix_pos = NULL;
   DWORD error_allow = 0;
@@ -612,7 +612,7 @@ static HANDLE create_shared_memory(MYSQL *mysql, NET *net,
   CloseHandle(connect_named_mutex);
   connect_named_mutex = NULL;
 
-  p = longlong10_to_str(connect_number, connect_number_char, 10);
+  longlong10_to_str(connect_number, connect_number_char, 10);
 
   /*
     The name of event and file-mapping events create agree next rule:

sql/CMakeLists.txt

@@ -1107,6 +1107,7 @@ IF(WIN32)
   ADD_COMPILE_FLAGS(mysqld.cc COMPILE_FLAGS "/wd4251")
   IF(WIN32_CLANG)
     ADD_COMPILE_FLAGS(mysqld.cc COMPILE_FLAGS " -Wno-microsoft-cast")
+    ADD_COMPILE_FLAGS(log_event.cc COMPILE_FLAGS " -Wno-microsoft-template")
   ENDIF()
 ENDIF()
 

sql/gis/transform_functor.h

@@ -37,11 +37,20 @@
 
 #include "my_compiler.h"
 
+// Clang 16 on windows gives warning:
+// pragma diagnostic pop could not pop, no matching push [-Wunknown-pragmas]
+// So there must be some mismatching push/pop in boost
+#if !defined(__clang__) || !defined(_WIN32)
 MY_COMPILER_DIAGNOSTIC_PUSH()
 MY_COMPILER_GCC_DIAGNOSTIC_IGNORE("-Wmaybe-uninitialized")
+#endif
+
 #include <boost/geometry.hpp>
 #include <boost/geometry/srs/transformation.hpp>
+
+#if !defined(__clang__) || !defined(_WIN32)
 MY_COMPILER_DIAGNOSTIC_POP()
+#endif
 
 #include "sql/gis/functor.h"
 #include "sql/gis/geometries.h"

sql/iterators/composite_iterators.cc

@@ -2315,9 +2315,7 @@ bool materialize_iterator::SpillState::initialize_first_HF_chunk_files() {
 /// later retrieve all rows belonging to each file set by scanning only a
 /// section of each chunk file.
 bool materialize_iterator::SpillState::spread_hash_map_to_HF_chunk_files() {
-  size_t total = 0;
   for (size_t set = 0; set < m_no_of_chunk_file_sets; set++) {
-    size_t rows_visited = 0;
     for (auto f = m_hash_map->begin(); f != m_hash_map->end(); f++) {
       LinkedImmutableString row_with_same_hash = f->second;
       while (row_with_same_hash != nullptr) {
@@ -2326,7 +2324,6 @@ bool materialize_iterator::SpillState::spread_hash_map_to_HF_chunk_files() {
         if (StoreFromTableBuffers(m_table_collection, &m_row_buffer)) {
           return true;
         }
-        rows_visited++;
         // Hash row's content with tertiary hash to determine its chunk index,
         // and write it if its set index equals the current set. This way,
         // all rows belonging to a set are stored consecutively, and sets in
@@ -2346,8 +2343,6 @@ bool materialize_iterator::SpillState::spread_hash_map_to_HF_chunk_files() {
             my_error(ER_TEMP_FILE_WRITE_FAILURE, MYF(0));
             return true;
           }
-
-          total++;
         }
         row_with_same_hash = row_with_same_hash.Decode().next;
       }
@@ -2520,10 +2515,8 @@ bool materialize_iterator::SpillState::save_operand_to_IF_chunk_files(
   }
 
   /// Rewind all IF chunk files and possibly REMAININGINPUT.
-  size_t offset = 0;
   for (auto &chunk : m_chunk_files) {
     if (chunk.probe_chunk.Rewind()) return true;
-    offset++;
   }
 
   return m_no_of_chunk_file_sets > 1 && m_remaining_input.Rewind();

storage/ndb/include/ndb_global.h

@@ -182,7 +182,9 @@ extern "C" {
 
 #define NDB_ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 
-#if defined(_WIN32) && (_MSC_VER > 1500)
+// clang fails with -Wdeprecated-builtins
+// __has_trivial_constructor is deprecated, use __is_trivially_constructible
+#if defined(_WIN32) && (_MSC_VER > 1500) && !defined(__clang__)
 #define HAVE___HAS_TRIVIAL_CONSTRUCTOR
 #define HAVE___IS_POD
 #endif