1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-34502 fixup: Do not cripple MSAN

Browse Source 
We need to work around deficiencies of Valgrind, and apparently
the previous work-around attempts
(such as d247d64988fb3b5d348e412813593a13f3be91fa) do not work
anymore, definitely not on recent clang-based compilers.

MemorySanitizer should be fine; unfortunately we set HAVE_valgrind for it
as well.
This commit is contained in:
Marko Mäkelä 2024-07-29 15:04:16 +03:00
parent 232d7a5e2d
commit 7e5c9ccda5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/include/mach0data.inl
View File

@ -38,7 +38,7 @@ mach_write_to_1(
byte* b, /*!< in: pointer to byte where to store */ byte* b, /*!< in: pointer to byte where to store */
ulint n) /*!< in: ulint integer to be stored, >= 0, < 256 */ ulint n) /*!< in: ulint integer to be stored, >= 0, < 256 */
{ {
#ifndef HAVE_valgrind #if !defined HAVE_valgrind || __has_feature(memory_sanitizer)
ut_ad((n & ~0xFFUL) == 0); ut_ad((n & ~0xFFUL) == 0);
#endif #endif
@ -57,7 +57,7 @@ mach_write_to_2(
byte* b, /*!< in: pointer to two bytes where to store */ byte* b, /*!< in: pointer to two bytes where to store */
ulint n) /*!< in: ulint integer to be stored */ ulint n) /*!< in: ulint integer to be stored */
{ {
#ifndef HAVE_valgrind #if !defined HAVE_valgrind || __has_feature(memory_sanitizer)
ut_ad((n & ~0xFFFFUL) == 0); ut_ad((n & ~0xFFFFUL) == 0);
#endif #endif