[llvm-commits] [compiler-rt] r171054 - /compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc

[Dmitry Vyukov]

Author: dvyukov
Date: Tue Dec 25 01:45:40 2012
New Revision: 171054

URL: http://llvm.org/viewvc/llvm-project?rev=171054&view=rev
Log:
tsan: fix the code that searches for heap memory block metadata
(the old code won't work with new allocator)

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc?rev=171054&r1=171053&r2=171054&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_mman.cc Tue Dec 25 01:45:40 2012
@@ -119,9 +119,9 @@
 }
 
 MBlock *user_mblock(ThreadState *thr, void *p) {
-  // CHECK_GT(thr->in_rtl, 0);
   CHECK_NE(p, (void*)0);
-  return (MBlock*)allocator()->GetMetaData(p);
+  Allocator *a = allocator();
+  return (MBlock*)a->GetMetaData(a->GetBlockBegin(p));
 }
 
 void invoke_malloc_hook(void *ptr, uptr size) {