do mlock2() workaround differently

src/pinnable_mapped_file.cpp

@@ -14,8 +14,11 @@
 #include <sys/sysinfo.h>
 #endif
 
-#ifndef __has_feature
-#define __has_feature(x) 0
+// use mlock2() on Linux to avoid a noop intercept of mlock() when ASAN is enabled (still present in compiler-rt 18.1)
+#ifdef __linux__
+#define MLOCK(a, b) mlock2(a, b, 0)
+#else
+#define MLOCK(a, b) mlock(a, b)
 #endif
 
 namespace chainbase {
@@ -220,13 +223,7 @@ pinnable_mapped_file::pinnable_mapped_file(const std::filesystem::path& dir, boo
 
 #ifndef _WIN32
       if(mode == locked) {
-#if __has_feature(address_sanitizer) && defined(__linux__)
-         //as of llvm's compilerrt 18, mlock() continues to be intercepted as a noop thus breaking tests the expect memory locking
-         // to fail. mlock2() isn't intercepted though, so use it when ASAN is enabled on Linux
-         if(mlock2(_non_file_mapped_mapping, _non_file_mapped_mapping_size, 0)) {
-#else
-         if(mlock(_non_file_mapped_mapping, _non_file_mapped_mapping_size)) {
-#endif
+         if(MLOCK(_non_file_mapped_mapping, _non_file_mapped_mapping_size)) {
             std::string what_str("Failed to mlock database \"" + _database_name + "\"");
             BOOST_THROW_EXCEPTION(std::system_error(make_error_code(db_error_code::no_mlock), what_str));
          }