diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-10-28 20:34:11 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-28 20:34:11 +0000 |
| commit | ef9875b11a33dbd25e92bc6b4cf692c18c9ba0ce (patch) | |
| tree | 1f2fd4e4d9e585da35937b42fbda5f854af04728 /library/cpp/regex | |
| parent | 37ae9cc90160b53eb0e22021c47b3996a01cd656 (diff) | |
| parent | e3c8507a3d1cb090278f211232ddfde3bedc54d4 (diff) | |
| download | ydb-ef9875b11a33dbd25e92bc6b4cf692c18c9ba0ce.tar.gz | |
Merge branch 'rightlib' into mergelibs-241028-2033
Diffstat (limited to 'library/cpp/regex')
| -rw-r--r-- | library/cpp/regex/hyperscan/hyperscan.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/cpp/regex/hyperscan/hyperscan.cpp b/library/cpp/regex/hyperscan/hyperscan.cpp index ba85e9bbab..5b6069d4a3 100644 --- a/library/cpp/regex/hyperscan/hyperscan.cpp +++ b/library/cpp/regex/hyperscan/hyperscan.cpp @@ -10,6 +10,7 @@ #include <contrib/libs/hyperscan/runtime_avx512/hs_runtime.h> #include <util/generic/singleton.h> +#include <util/system/sanitizers.h> namespace NHyperscan { using TSerializedDatabase = THolder<char, TDeleter<decltype(&free), &free>>; @@ -18,7 +19,8 @@ namespace NHyperscan { namespace NPrivate { ERuntime DetectCurrentRuntime() { - if (NX86::HaveAVX512F() && NX86::HaveAVX512BW()) { + // TODO: Remove MSanIsOn check upon DEVTOOLSSUPPORT-49258 resolution + if (NX86::HaveAVX512F() && NX86::HaveAVX512BW() && !NSan::MSanIsOn()) { return ERuntime::AVX512; } else if (NX86::HaveAVX() && NX86::HaveAVX2()) { return ERuntime::AVX2; |