[tsan] Modify the tls_race.cc and tls_race2.cc tests to pass on OS X

[kubamracek]

Summary

On OS X, __thread variables are lazily heap-allocated (with malloc). Therefore, they're recognized as heap blocks (which is what they are) and not as TLS variables in TSan reports. Figuring out if a heap block is a TLS or not is difficult (in malloc interceptor we could analyze the caller and then mark the object), so let's instead modify the tests so that we expect the report to say "Location is heap block" instead of "Location is TLS".

[dvyukov]

test/tsan/tls_race.cc

23

How does the heap block allocation stack look like? Is it possible to figure out that this is TLS from the stack?

test/tsan/tls_race2.cc

28

revert this back to "thread T1"

[kubamracek]

test/tsan/tls_race.cc

23

The stack looks like this:

* frame #0: 0x0000000100077890 libclang_rt.tsan_osx_dynamic.dylib`::wrap_malloc(size=4294971592) at sanitizer_malloc_mac.inc:96
  frame #1: 0x00007fff86555d7d libdyld.dylib`tlv_allocate_and_initialize_for_key + 370
  frame #2: 0x00007fff8655652c libdyld.dylib`tlv_get_addr + 296
  frame #3: 0x0000000100000dc7 tls_race.cc.tmp`main + 55 at tls_race.cc:14 [opt]
  frame #4: 0x00007fff865565ad libdyld.dylib`start + 1

To figure out this is a TLS, we could recognize that the caller is tlv_allocate_and_initialize_for_key, but for that we'd need to symbolicate first. FYI, there are no other calls to malloc from tlv_allocate_and_initialize_for_key. This function is internal (non-interceptible). If you have any easy solution in mind, please tell me.

[dvyukov]

test/tsan/tls_race.cc

23

OK, let's leave it as is for now.

[kubamracek]

Updating patch.

test/tsan/tls_race.cc

-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"
 
 void *Thread(void *a) {
   barrier_wait(&barrier);
   *(int*)a = 43;
   return 0;
 }
 
 int main() {
   barrier_init(&barrier, 2);
   static __thread int Var = 42;
   pthread_t t;
   pthread_create(&t, 0, Thread, &Var);
   Var = 43;
   barrier_wait(&barrier);
   pthread_join(t, 0);
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Location is TLS of main thread.
+// CHECK-Linux:   Location is TLS of main thread.
+// CHECK-FreeBSD:   Location is TLS of main thread.
+// CHECK-Darwin:   Location is heap block of size 4

test/tsan/tls_race2.cc

-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s --check-prefix=CHECK-%os --check-prefix=CHECK
 #include "test.h"
 
 void *Thread2(void *a) {
   barrier_wait(&barrier);
   *(int*)a = 43;
   return 0;
 }
 

 int main() {
   barrier_init(&barrier, 2);
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   pthread_join(t, 0);
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Location is TLS of thread T1.
-
+// CHECK-Linux:   Location is TLS of main thread.
+// CHECK-FreeBSD:   Location is TLS of main thread.
+// CHECK-Darwin:   Location is heap block of size 4