Bug#27660330 ADD SUPPORT FOR CLANG UBSAN basic patch

Basic patch to get clang UBSAN up and running.

protoc built with clang -fsanitize=undefined dumps core, so strip away those
flags in extra/protobuf/CMakeLists.txt

Add clang version of SUPPRESS_UBSAN which is slightly different from
the one we already have for gcc.

Increase default thread stack size for UBSAN builds: reuse settings
from gcc UBSAN on 32bit platforms.

Change-Id: I7f6811e8c352121a2e569765c8877c0c8ddedaeb

Author: Tor Didriksen

extra/protobuf/CMakeLists.txt

@@ -64,6 +64,16 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   ENDIF()
 ENDIF()
 
+# protoc built with clang -fsanitize=undefined dumps core
+IF (HAVE_UBSAN)
+  STRING(REPLACE "-fsanitize=undefined" ""
+    CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+  STRING(REPLACE "-fsanitize=undefined" ""
+    CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+  STRING(REPLACE "-fsanitize=undefined" ""
+    CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+ENDIF()
+
 ADD_DEFINITIONS(-DHAVE_ZLIB)
 IF(CMAKE_USE_PTHREADS_INIT)
   ADD_DEFINITIONS(-DHAVE_PTHREAD)

include/my_compiler.h

@@ -1,7 +1,7 @@
 #ifndef MY_COMPILER_INCLUDED
 #define MY_COMPILER_INCLUDED
 
-/* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -171,7 +171,11 @@ struct my_aligned_storage {
 #endif
 
 #ifndef SUPPRESS_UBSAN
-#if __has_attribute(no_sanitize_undefined)
+// clang -fsanitize=undefined
+#if defined(HAVE_UBSAN) && defined(__clang__)
+#define SUPPRESS_UBSAN MY_ATTRIBUTE((no_sanitize("undefined")))
+// gcc -fsanitize=undefined
+#elif __has_attribute(no_sanitize_undefined)
 #define SUPPRESS_UBSAN MY_ATTRIBUTE((no_sanitize_undefined))
 #else
 #define SUPPRESS_UBSAN

include/my_thread.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -53,7 +53,7 @@
 */
 #if defined(__sparc) && (defined(__SUNPRO_CC) || defined(__SUNPRO_C))
 #define STACK_MULTIPLIER 2UL
-#elif defined HAVE_UBSAN && SIZEOF_CHARP == 4
+#elif defined HAVE_UBSAN
 #define STACK_MULTIPLIER 3UL
 #else
 #define STACK_MULTIPLIER 1UL

mysql-test/include/mysqld--help.inc

@@ -61,6 +61,7 @@ perl;
     # s/\b196608\b/262144/;
     # s/\b524288\b/262144/;
     # s/\b393216\b/262144/;
+    s/\b860160\b/262144/;
     s/\b573440\b/262144/;
     s/\b286720\b/262144/;
     s/\b442368\b/262144/;