<div dir="ltr">thanks! (ouch!)</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Apr 17, 2014 at 9:29 PM, Alexander Potapenko <span dir="ltr"><<a href="mailto:glider@google.com" target="_blank">glider@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: glider<br>
Date: Thu Apr 17 12:29:07 2014<br>
New Revision: 206477<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=206477&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=206477&view=rev</a><br>
Log:<br>
[ASan] Change AddressSanitizer.LoadStoreCallbacks to use asan_malloc and asan_free.<br>
Interceptors don't really work on OSX in asan_noinst_test.cc (this is more or less intentional),<br>
so one shouldn't call intercepted functions in this test -- added a comment about this.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=206477&r1=206476&r2=206477&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc?rev=206477&r1=206476&r2=206477&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_noinst_test.cc Thu Apr 17 12:29:07 2014<br>
@@ -25,6 +25,11 @@<br>
 #include <vector><br>
 #include <limits><br>
<br>
+// ATTENTION!<br>
+// Please don't call intercepted functions (including malloc() and friends)<br>
+// in this test. The static runtime library is linked explicitly (without<br>
+// -fsanitize=address), thus the interceptors do not work correctly on OS X.<br>
+<br>
 extern "C" {<br>
 // Set specific ASan options for uninstrumented unittest.<br>
 const char* __asan_default_options() {<br>
@@ -233,8 +238,12 @@ TEST(AddressSanitizer, LoadStoreCallback<br>
   uptr buggy_ptr;<br>
<br>
   __asan_test_only_reported_buggy_pointer = &buggy_ptr;<br>
+  StackTrace stack;<br>
+  stack.trace[0] = 0x890;<br>
+  stack.size = 1;<br>
+<br>
   for (uptr len = 16; len <= 32; len++) {<br>
-    char *ptr = new char[len];<br>
+    char *ptr = (char*) __asan::asan_malloc(len, &stack);<br>
     uptr p = reinterpret_cast<uptr>(ptr);<br>
     for (uptr is_write = 0; is_write <= 1; is_write++) {<br>
       for (uptr size_log = 0; size_log <= 4; size_log++) {<br>
@@ -251,7 +260,7 @@ TEST(AddressSanitizer, LoadStoreCallback<br>
         }<br>
       }<br>
     }<br>
-    delete [] ptr;<br>
+    __asan::asan_free(ptr, &stack, __asan::FROM_MALLOC);<br>
   }<br>
   __asan_test_only_reported_buggy_pointer = 0;<br>
 }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>