[llvm-commits] [llvm] r145092 - in /llvm/trunk: lib/Transforms/Instrumentation/AddressSanitizer.cpp test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll

[Kostya Serebryany]

Author: kcc
Date: Tue Nov 22 20:10:54 2011
New Revision: 145092

URL: http://llvm.org/viewvc/llvm-project?rev=145092&view=rev
Log:
[asan] do not instrument threadlocal globals, this is buggy

Added:
    llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll
Modified:
    llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Modified: llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp?rev=145092&r1=145091&r2=145092&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/AddressSanitizer.cpp Tue Nov 22 20:10:54 2011
@@ -455,6 +455,11 @@
         G->getLinkage() != GlobalVariable::PrivateLinkage &&
         G->getLinkage() != GlobalVariable::InternalLinkage)
       continue;
+    // Two problems with thread-locals:
+    //   - The address of the main thread's copy can't be computed at link-time.
+    //   - Need to poison all copies, not just the main thread's one.
+    if (G->isThreadLocal())
+      continue;
     // For now, just ignore this Alloca if the alignment is large.
     if (G->getAlignment() > RedzoneSize) continue;
 
@@ -787,6 +792,7 @@
 
 // Workaround for bug 11395: we don't want to instrument stack in functions
 // with large assembly blobs (32-bit only), otherwise reg alloc may crash.
+// FIXME: remove once the bug 11395 is fixed.
 bool AddressSanitizer::LooksLikeCodeInBug11395(Instruction *I) {
   if (LongSize != 32) return false;
   CallInst *CI = dyn_cast<CallInst>(I);

Added: llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll?rev=145092&view=auto
==============================================================================
--- llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll (added)
+++ llvm/trunk/test/Instrumentation/AddressSanitizer/do-not-touch-threadlocal.ll Tue Nov 22 20:10:54 2011
@@ -0,0 +1,6 @@
+; RUN: opt < %s -asan -S | FileCheck %s
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
+target triple = "x86_64-unknown-linux-gnu"
+; no action should be taken for thread locals
+ at xxx = thread_local global i32 0, align 4
+; CHECK-NOT: __asan_register_globals