[compiler-rt] r334719 - [ASAN] fix typos and disable long-object-path test for win32

[Peter Wu via llvm-commits]

Author: lekensteyn
Date: Thu Jun 14 08:12:46 2018
New Revision: 334719

URL: http://llvm.org/viewvc/llvm-project?rev=334719&view=rev
Log:
[ASAN] fix typos and disable long-object-path test for win32

Glob patterns seem unsupported for commands executed by the emulated
shell (LIT_USE_INTERNAL_SHELL=1). Disable the test while that is being
addressed (a workaround such as "cd a-*" also does not work).

Modified:
    compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
    compiler-rt/trunk/test/asan/TestCases/long-object-path.cc

Modified: compiler-rt/trunk/lib/asan/asan_malloc_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=334719&r1=334718&r2=334719&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_malloc_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_malloc_linux.cc Thu Jun 14 08:12:46 2018
@@ -50,8 +50,8 @@ static void *AllocateFromLocalPool(uptr
 }
 
 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];

Modified: compiler-rt/trunk/test/asan/TestCases/long-object-path.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/long-object-path.cc?rev=334719&r1=334718&r2=334719&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/long-object-path.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/long-object-path.cc Thu Jun 14 08:12:46 2018
@@ -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;