Bug #32859533 -DWITH_ASAN=ON CMAKE OPTION DOES NOT ADD -FSANITIZE=ADDRESS COMPILER FLAG

There was a glitch in the patch for
    Bug #32287863 BACKPORT THE PATCH FOR BUG #27874068 ADD SUPPORT FOR -DCMAKE_BUILD_TYPE=RELEASE

Add -fsanitize=address to C/CXX FLAGS if the feature test succeeds.

Also fix a broken feature test for crypt (function and library).

Change-Id: I537b0bda616da5216b613ae714e0859afed9f114

Author: Tor Didriksen

CMakeLists.txt

@@ -344,6 +344,8 @@ MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
   MY_CHECK_C_COMPILER_FLAG("${SAN_OPT}" C_RESULT)
   MY_CHECK_CXX_COMPILER_FLAG("${SAN_OPT}" CXX_RESULT)
   IF(C_RESULT AND CXX_RESULT)
+    STRING_APPEND(CMAKE_C_FLAGS   " ${SAN_OPT}")
+    STRING_APPEND(CMAKE_CXX_FLAGS " ${SAN_OPT}")
     # We switch on basic optimization also for debug builds.
     # We disable inlining for stack trace readability.
     # With optimization we may get some warnings, so we switch off -Werror
@@ -360,10 +362,10 @@ MACRO(MY_SANITIZER_CHECK SAN_OPT RESULT)
 ENDMACRO()
 
 OPTION(WITH_ASAN "Enable address sanitizer" OFF)
-OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" OFF)
 IF(WITH_ASAN)
   MY_SANITIZER_CHECK("-fsanitize=address" WITH_ASAN_OK)
   IF(WITH_ASAN_OK)
+    OPTION(WITH_ASAN_SCOPE "Enable -fsanitize-address-use-after-scope" ON)
     SET(HAVE_ASAN 1)
     # This works with clang, but not gcc it seems.
     MY_CHECK_CXX_COMPILER_FLAG(

configure.cmake

@@ -150,6 +150,15 @@ IF(UNIX)
   ENDIF()
   MY_SEARCH_LIBS(gethostbyname_r  "nsl_r;nsl" LIBNSL)
   MY_SEARCH_LIBS(bind "bind;socket" LIBBIND)
+  # Feature test broken with -fsanitize=address, look for lib first.
+  IF(CMAKE_C_FLAGS MATCHES "-fsanitize=")
+    CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_crypt_IN_crypt)
+    # If found, do not look in libc.
+    IF(HAVE_crypt_IN_crypt)
+      SET(LIBCRYPT crypt)
+      SET(${LIBCRYPT} 1)
+    ENDIF()
+  ENDIF()
   MY_SEARCH_LIBS(crypt crypt LIBCRYPT)
   MY_SEARCH_LIBS(setsockopt socket LIBSOCKET)
   MY_SEARCH_LIBS(dlopen dl LIBDL)

mysql-test/include/have_grep.inc

@@ -4,7 +4,7 @@
 123
 456
 EOF
---error 0,1,2,127,512
+--error 0,1,2,42,127,512
 --exec grep -v -e "123" $MYSQL_TMP_DIR/grep_check
 let $status= $__error;
 --remove_file $MYSQL_TMP_DIR/grep_check

mysql-test/suite/innodb/t/alter_crash.test

@@ -1,6 +1,7 @@
 # Crash-safe InnoDB ALTER operations
 
 --source include/not_valgrind.inc
+--source include/not_asan.inc
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_debug.inc

unittest/gunit/segfault-t.cc

@@ -68,7 +68,7 @@ TEST_F(FatalSignalDeathTest, Segfault)
    gtest library instead.
   */
   EXPECT_DEATH_IF_SUPPORTED(*pint= 42, "");
-#elif defined(__SANITIZE_ADDRESS__)
+#elif defined(HAVE_ASAN)
   /* gcc 4.8.1 with '-fsanitize=address -O1' */
   /* Newer versions of ASAN give other error message, disable it */
   // EXPECT_DEATH_IF_SUPPORTED(*pint= 42, ".*ASAN:SIGSEGV.*");