[MSan] updates

nav-io · Feb 19, 2024 · 52332a2 · 52332a2
1 parent 6067ba9
commit 52332a2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
@@ -10,6 +10,7 @@ set -ex
 
 export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
 export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
+export MSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/msan"
 export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
 export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
 

diff --git a/src/blsct/arith/mcl/mcl_init.h b/src/blsct/arith/mcl/mcl_init.h
@@ -35,16 +35,7 @@ class MclInit
         static bool is_initialized = false;
         if (is_initialized) return;
 
-#ifndef MCLBN_COMPILED_TIME_VAR
-        int compiledTimeVar = 0;
-#else
-        int compiledTimeVar = MCLBN_COMPILED_TIME_VAR;
-#endif
-
-        if (blsInit(
-            MCL_BLS12_381,
-            compiledTimeVar
-        ) != 0) {
+        if (blsInit(MCL_BLS12_381, MCLBN_COMPILED_TIME_VAR) != 0) {
             throw std::runtime_error("blsInit failed");
         }
         mclBn_setETHserialization(1);

diff --git a/test/sanitizer_suppressions/msan b/test/sanitizer_suppressions/msan
@@ -1,4 +1,3 @@
 [memory]
 # false-positive in mcl
 fun:*mcl*
-