<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Feb 20, 2013 at 7:46 AM, 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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: glider<br>
Date: Wed Feb 20 09:46:02 2013<br>
New Revision: 175631<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=175631&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=175631&view=rev</a><br>
Log:<br>
[ASan] Delete asan/dynamic dir and temporarily move the interposers declarations to asan_intercepted_functions.h<br>
Now that we have only one dependency on asan_intercepted_functions.h, we can unite that code with the interceptors declarations in asan_interceptors.cc and get rid of asan_intercepted_functions.h<br></blockquote><div><br>
</div><div style>I'm going to go out on a limb & suggest that this (or some related changes from you recently) caused this:<br><br><div>FAIL: AddressSanitizer-Unit :: /usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test/AddressSanitizer.AllocDeallocMismatch (41 of 14077)</div>
<div>******************** TEST 'AddressSanitizer-Unit :: /usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test/AddressSanitizer.AllocDeallocMismatch' FAILED ********************</div>
<div>Note: Google Test filter = AddressSanitizer.AllocDeallocMismatch</div><div>[==========] Running 1 test from 1 test case.</div><div>[----------] Global test environment set-up.</div><div>[----------] 1 test from AddressSanitizer</div>
<div>[ RUN ] AddressSanitizer.AllocDeallocMismatch</div><div>=================================================================</div><div>==14202== ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) on 0xf7302870</div>
<div> #0 0x8094714 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8094714)</div><div> #1 0x811009d (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x811009d)</div>
<div> #2 0x8254aa5 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8254aa5)</div><div> #3 0x82574c2 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x82574c2)</div>
<div> #4 0x8258ec9 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8258ec9)</div><div> #5 0x82699da (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x82699da)</div>
<div> #6 0x828bffb (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x828bffb)</div><div> #7 0x8269012 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8269012)</div>
<div> #8 0x80c071f (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x80c071f)</div><div>0xf7302870 is located 0 bytes inside of 4-byte region [0xf7302870,0xf7302874)</div>
<div>allocated by thread T0 here:</div><div> #0 0x8094c94 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8094c94)</div><div> #1 0x811008e (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x811008e)</div>
<div> #2 0x8254aa5 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8254aa5)</div><div> #3 0x82574c2 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x82574c2)</div>
<div> #4 0x8258ec9 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8258ec9)</div><div> #5 0x82699da (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x82699da)</div>
<div> #6 0x828bffb (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x828bffb)</div><div> #7 0x8269012 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x8269012)</div>
<div> #8 0x80c071f (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-i386-Test+0x80c071f)</div><div>==14202== HINT: if you don't care about these warnings you may set ASAN_OPTIONS=alloc_dealloc_mismatch=0</div>
<div>==14202== ABORTING</div><div><br></div><div>********************</div><div>Testing: </div><div>FAIL: AddressSanitizer-Unit :: /usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test/AddressSanitizer.AllocDeallocMismatch (175 of 14077)</div>
<div>******************** TEST 'AddressSanitizer-Unit :: /usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test/AddressSanitizer.AllocDeallocMismatch' FAILED ********************</div>
<div>Note: Google Test filter = AddressSanitizer.AllocDeallocMismatch</div><div>[==========] Running 1 test from 1 test case.</div><div>[----------] Global test environment set-up.</div><div>[----------] 1 test from AddressSanitizer</div>
<div>[ RUN ] AddressSanitizer.AllocDeallocMismatch</div><div>=================================================================</div><div>==16677== ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) on 0x60040000b0f0</div>
<div> #0 0x451212 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x451212)</div><div> #1 0x5ebe67 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5ebe67)</div>
<div> #2 0x5be005 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5be005)</div><div> #3 0x5c17fd (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5c17fd)</div>
<div> #4 0x5cf9f9 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5cf9f9)</div><div> #5 0x5ed2c7 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5ed2c7)</div>
<div> #6 0x5cf1a6 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5cf1a6)</div><div>0x60040000b0f0 is located 0 bytes inside of 4-byte region [0x60040000b0f0,0x60040000b0f4)</div>
<div>allocated by thread T0 here:</div><div> #0 0x451742 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x451742)</div><div> #1 0x4b9e3a (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x4b9e3a)</div>
<div> #2 0x5be005 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5be005)</div><div> #3 0x5c17fd (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5c17fd)</div>
<div> #4 0x5cf9f9 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5cf9f9)</div><div> #5 0x5ed2c7 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5ed2c7)</div>
<div> #6 0x5cf1a6 (/usr/local/google/home/blaikie/dev/llvm/build/clang/debug/projects/compiler-rt/lib/asan/tests/Asan-x86_64-Test+0x5cf1a6)</div><div>==16677== HINT: if you don't care about these warnings you may set ASAN_OPTIONS=alloc_dealloc_mismatch=0</div>
<div>==16677== ABORTING</div><div><br></div><div>********************</div><div><br></div><div style>Any ideas?</div></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
Removed:<br>
compiler-rt/trunk/lib/asan/dynamic/<br>
Modified:<br>
compiler-rt/trunk/lib/asan/CMakeLists.txt<br>
compiler-rt/trunk/lib/asan/Makefile.mk<br>
compiler-rt/trunk/lib/asan/asan_intercepted_functions.h<br>
compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
<br>
Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=175631&r1=175630&r2=175631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=175631&r1=175630&r2=175631&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Wed Feb 20 09:46:02 2013<br>
@@ -25,7 +25,6 @@ set(ASAN_SOURCES<br>
<br>
set(ASAN_DYLIB_SOURCES<br>
${ASAN_SOURCES}<br>
- dynamic/asan_interceptors_dynamic.cc<br>
)<br>
<br>
include_directories(..)<br>
<br>
Modified: compiler-rt/trunk/lib/asan/Makefile.mk<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=175631&r1=175630&r2=175631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/Makefile.mk?rev=175631&r1=175630&r2=175631&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/Makefile.mk (original)<br>
+++ compiler-rt/trunk/lib/asan/Makefile.mk Wed Feb 20 09:46:02 2013<br>
@@ -8,7 +8,7 @@<br>
#===------------------------------------------------------------------------===#<br>
<br>
ModuleName := asan<br>
-SubDirs := dynamic<br>
+SubDirs :=<br>
<br>
Sources := $(foreach file,$(wildcard $(Dir)/*.cc),$(notdir $(file)))<br>
ObjNames := $(Sources:%.cc=%.o)<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_intercepted_functions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_intercepted_functions.h?rev=175631&r1=175630&r2=175631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_intercepted_functions.h?rev=175631&r1=175630&r2=175631&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_intercepted_functions.h (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_intercepted_functions.h Wed Feb 20 09:46:02 2013<br>
@@ -79,9 +79,36 @@ using __sanitizer::uptr;<br>
# define ASAN_INTERCEPT___CXA_THROW 0<br>
#endif<br>
<br>
+#define INTERPOSE_FUNCTION(function) \<br>
+ { reinterpret_cast<const uptr>(WRAP(function)), \<br>
+ reinterpret_cast<const uptr>(function) }<br>
+<br>
+#define INTERPOSE_FUNCTION_2(function, wrapper) \<br>
+ { reinterpret_cast<const uptr>(wrapper), \<br>
+ reinterpret_cast<const uptr>(function) }<br>
+<br>
+struct interpose_substitution {<br>
+ const uptr replacement;<br>
+ const uptr original;<br>
+};<br>
+<br>
+#define INTERPOSER(func) __attribute__((used)) \<br>
+const interpose_substitution substitution_##func[] \<br>
+ __attribute__((section("__DATA, __interpose"))) = { \<br>
+ INTERPOSE_FUNCTION(func), \<br>
+}<br>
+<br>
+#define INTERPOSER_2(func, wrapper) __attribute__((used)) \<br>
+const interpose_substitution substitution_##func[] \<br>
+ __attribute__((section("__DATA, __interpose"))) = { \<br>
+ INTERPOSE_FUNCTION_2(func, wrapper), \<br>
+}<br>
+<br>
+<br>
#define DECLARE_FUNCTION_AND_WRAPPER(ret_type, func, ...) \<br>
ret_type func(__VA_ARGS__); \<br>
- ret_type WRAP(func)(__VA_ARGS__)<br>
+ ret_type WRAP(func)(__VA_ARGS__); \<br>
+ INTERPOSER(func)<br>
<br>
// Use extern declarations of intercepted functions on Mac and Windows<br>
// to avoid including system headers.<br>
@@ -141,7 +168,8 @@ DECLARE_FUNCTION_AND_WRAPPER(char*, strd<br>
DECLARE_FUNCTION_AND_WRAPPER(uptr, strnlen, const char *s, uptr maxlen);<br>
# endif<br>
# if ASAN_INTERCEPT_INDEX<br>
-DECLARE_FUNCTION_AND_WRAPPER(char*, index, const char *string, int c);<br>
+char* index(const char *string, int c);<br>
+INTERPOSER_2(index, WRAP(strchr));<br>
# endif<br>
<br>
// stdlib.h<br>
@@ -221,17 +249,6 @@ DECLARE_FUNCTION_AND_WRAPPER(int, fscanf<br>
void* stream, const char *format, ...);<br>
DECLARE_FUNCTION_AND_WRAPPER(int, sscanf, // NOLINT<br>
const char *str, const char *format, ...);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_vscanf, const char *format,<br>
- va_list ap);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_vsscanf, const char *str,<br>
- const char *format, va_list ap);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_vfscanf, void *stream,<br>
- const char *format, va_list ap);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_scanf, const char *format, ...);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_fscanf,<br>
- void* stream, const char *format, ...);<br>
-DECLARE_FUNCTION_AND_WRAPPER(int, __isoc99_sscanf, // NOLINT<br>
- const char *str, const char *format, ...);<br>
# endif<br>
<br>
# if defined(__APPLE__)<br>
@@ -294,9 +311,11 @@ DECLARE_FUNCTION_AND_WRAPPER(void *, val<br>
DECLARE_FUNCTION_AND_WRAPPER(size_t, malloc_good_size, size_t size);<br>
DECLARE_FUNCTION_AND_WRAPPER(int, posix_memalign,<br>
void **memptr, size_t alignment, size_t size);<br>
+#if 0<br>
DECLARE_FUNCTION_AND_WRAPPER(void, _malloc_fork_prepare, void);<br>
DECLARE_FUNCTION_AND_WRAPPER(void, _malloc_fork_parent, void);<br>
DECLARE_FUNCTION_AND_WRAPPER(void, _malloc_fork_child, void);<br>
+#endif<br>
<br>
<br>
<br>
<br>
Modified: compiler-rt/trunk/lib/asan/tests/asan_test.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=175631&r1=175630&r2=175631&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_test.cc?rev=175631&r1=175630&r2=175631&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/asan/tests/asan_test.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/tests/asan_test.cc Wed Feb 20 09:46:02 2013<br>
@@ -1133,11 +1133,15 @@ TEST(AddressSanitizer, AttributeNoAddres<br>
<br>
// It doesn't work on Android, as calls to new/delete go through malloc/free.<br>
#if !defined(ANDROID) && !defined(__ANDROID__)<br>
+#if 0<br>
static string MismatchStr(const string &str) {<br>
return string("AddressSanitizer: alloc-dealloc-mismatch \\(") + str;<br>
}<br>
+#endif<br>
<br>
TEST(AddressSanitizer, AllocDeallocMismatch) {<br>
+ free(Ident(new int));<br>
+#if 0<br>
EXPECT_DEATH(free(Ident(new int)),<br>
MismatchStr("operator new vs free"));<br>
EXPECT_DEATH(free(Ident(new int[2])),<br>
@@ -1150,6 +1154,7 @@ TEST(AddressSanitizer, AllocDeallocMisma<br>
MismatchStr("operator new vs operator delete \\[\\]"));<br>
EXPECT_DEATH(delete [] (Ident((int*)malloc(2 * sizeof(int)))),<br>
MismatchStr("malloc vs operator delete \\[\\]"));<br>
+#endif<br>
}<br>
#endif<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></div>