diff --git a/Makefile b/Makefile index f355a4e6ba80ed9796985e46d74d34fa4dee09bb..aa72c2752ff657351db6b93e26f2cab8161743b2 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ LD_ubsan = clang LDXX_ubsan = clang++ CPPFLAGS_ubsan = -O0 -fsanitize-coverage=edge -fsanitize=undefined -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs LDFLAGS_ubsan = -fsanitize=undefined,unsigned-integer-overflow -DEFINES_ubsan = NDEBUG +DEFINES_ubsan = NDEBUG GRPC_UBSAN VALID_CONFIG_tsan = 1 REQUIRE_CUSTOM_LIBRARIES_tsan = 1 diff --git a/build.yaml b/build.yaml index 52ddc3287f1f1e3abaf938c3345588cf0c79cbd4..cd38b3cf33e69f714d87044a1df85e1160a862f8 100644 --- a/build.yaml +++ b/build.yaml @@ -4467,7 +4467,7 @@ configs: CPPFLAGS: -O0 -fsanitize-coverage=edge -fsanitize=undefined -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs CXX: clang++ - DEFINES: NDEBUG + DEFINES: NDEBUG GRPC_UBSAN LD: clang LDFLAGS: -fsanitize=undefined,unsigned-integer-overflow LDXX: clang++ diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index 0180d6f08d446b5d83f40ea69fbc8421d8608bb8..9a400c54ca22f928b585f025b76aa3218f1343e9 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -348,6 +348,14 @@ bool BuiltUnderMsan() { #endif } +bool BuiltUnderUbsan() { +#ifdef GRPC_UBSAN + return true; +#else + return false; +#endif +} + int64_t grpc_test_sanitizer_slowdown_factor() { int64_t sanitizer_multiplier = 1; if (BuiltUnderValgrind()) { @@ -358,6 +366,8 @@ int64_t grpc_test_sanitizer_slowdown_factor() { sanitizer_multiplier = 3; } else if (BuiltUnderMsan()) { sanitizer_multiplier = 4; + } else if (BuiltUnderUbsan()) { + sanitizer_multiplier = 5; } return sanitizer_multiplier; }