[compiler-rt] r367188 - Don't initialize interceptor_metadata_map unless SI_POSIX is set
Eugene Leviant via llvm-commits
llvm-commits at lists.llvm.org
Sun Jul 28 01:58:44 PDT 2019
Author: evgeny777
Date: Sun Jul 28 01:58:44 2019
New Revision: 367188
URL: http://llvm.org/viewvc/llvm-project?rev=367188&view=rev
Log:
Don't initialize interceptor_metadata_map unless SI_POSIX is set
Differential revision: https://reviews.llvm.org/D64794
Modified:
compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=367188&r1=367187&r2=367188&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Sun Jul 28 01:58:44 2019
@@ -317,11 +317,11 @@ struct CommonInterceptorMetadata {
};
};
+#if SI_POSIX
typedef AddrHashMap<CommonInterceptorMetadata, 31051> MetadataHashMap;
static MetadataHashMap *interceptor_metadata_map;
-#if SI_POSIX
UNUSED static void SetInterceptorMetadata(__sanitizer_FILE *addr,
const FileMetadata &file) {
MetadataHashMap::Handle h(interceptor_metadata_map, (uptr)addr);
@@ -9551,9 +9551,11 @@ INTERCEPTOR(void, sl_free, void *sl, int
#endif
static void InitializeCommonInterceptors() {
+#if SI_POSIX
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
interceptor_metadata_map =
new ((void *)&metadata_mem) MetadataHashMap(); // NOLINT
+#endif
INIT_MMAP;
INIT_MMAP64;
More information about the llvm-commits
mailing list