diff options
| -rw-r--r-- | compiler-rt/lib/asan/asan_malloc_linux.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/long-object-path.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_malloc_linux.cc b/compiler-rt/lib/asan/asan_malloc_linux.cc index 7152fe06718..76bdff999d6 100644 --- a/compiler-rt/lib/asan/asan_malloc_linux.cc +++ b/compiler-rt/lib/asan/asan_malloc_linux.cc @@ -50,8 +50,8 @@ static void *AllocateFromLocalPool(uptr size_in_bytes) { } static void DeallocateFromLocalPool(const void *ptr) { - // Hack: since glibc 2.27, dlsym longer use stack-allocated memory to store - // error messages and instead use malloc followed by free. To avoid pool + // Hack: since glibc 2.27 dlsym no longer uses stack-allocated memory to store + // error messages and instead uses malloc followed by free. To avoid pool // exhaustion due to long object filenames, handle that special case here. uptr prev_offset = allocated_for_dlsym - last_dlsym_alloc_size_in_words; void *prev_mem = (void*)&alloc_memory_for_dlsym[prev_offset]; diff --git a/compiler-rt/test/asan/TestCases/long-object-path.cc b/compiler-rt/test/asan/TestCases/long-object-path.cc index 592b0abb07d..42a196827cf 100644 --- a/compiler-rt/test/asan/TestCases/long-object-path.cc +++ b/compiler-rt/test/asan/TestCases/long-object-path.cc @@ -1,6 +1,7 @@ // RUN: mkdir -p %T/a-long-directory-name-to-test-allocations-for-exceptions-in-_dl_lookup_symbol_x-since-glibc-2.27 // RUN: %clangxx_asan -g %s -o %T/long-object-path // RUN: %run %T/a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../long-object-path +// UNSUPPORTED: win32 int main(void) { return 0; |
