Revert "[TSan] #include header instead of forward declaring interceptees"

[yln]

Summary

The reverted change silently bumped the minimal macOS SDK required for
building the TSan runtime to SDK 10.12. Let's ensure release 10 does
not unexpectedly break builders with old SDKs and add proper minimal SDK
checking in CMake for subsequent releases.

This reverts commit 894abb46f891cba2e0ef581650f27f512a7824b4.

Fixes bug #44682.
https://bugs.llvm.org/show_bug.cgi?id=44682

[dmajor]

Incidentally I wrote up this same patch and applied it locally earlier today, and our build still fails with the error below. Any ideas?

[task 2020-02-04T17:06:45.025Z] Undefined symbols for architecture x86_64:
[task 2020-02-04T17:06:45.025Z]   "_os_unfair_lock_trylock", referenced from:
[task 2020-02-04T17:06:45.025Z]       _wrap_os_unfair_lock_trylock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]       __tsan::substitution_os_unfair_lock_trylock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]      (maybe you meant: _wrap_os_unfair_lock_trylock)
[task 2020-02-04T17:06:45.025Z]   "_os_unfair_lock_unlock", referenced from:
[task 2020-02-04T17:06:45.025Z]       _wrap_os_unfair_lock_unlock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]       __tsan::substitution_os_unfair_lock_unlock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]      (maybe you meant: _wrap_os_unfair_lock_unlock)
[task 2020-02-04T17:06:45.025Z]   "_os_unfair_lock_lock", referenced from:
[task 2020-02-04T17:06:45.025Z]       _wrap_os_unfair_lock_lock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]       __tsan::substitution_os_unfair_lock_lock in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]      (maybe you meant: _wrap_os_unfair_lock_lock, _wrap_os_unfair_lock_lock_with_options )
[task 2020-02-04T17:06:45.025Z]   "_os_unfair_lock_lock_with_options", referenced from:
[task 2020-02-04T17:06:45.025Z]       _wrap_os_unfair_lock_lock_with_options in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]       __tsan::substitution_os_unfair_lock_lock_with_options in tsan_interceptors_mac.cpp.o
[task 2020-02-04T17:06:45.025Z]      (maybe you meant: _wrap_os_unfair_lock_lock_with_options)

[yln]

In D73973#1857267, @dmajor wrote:

Incidentally I wrote up this same patch and applied it locally earlier today, and our build still fails with the error below. Any ideas?

Ahh, of course, we can't intercept what isn't there. Apologies for the confusion.
New attempt: https://reviews.llvm.org/D74059

compiler-rt/lib/tsan/rtl/tsan_interceptors_mac.cpp

 #include "tsan_interceptors.h"
 #include "tsan_interface.h"
 #include "tsan_interface_ann.h"
 #include "sanitizer_common/sanitizer_addrhashmap.h"
 
 #include <errno.h>
 #include <libkern/OSAtomic.h>
 #include <objc/objc-sync.h>
-#include <os/lock.h>
 #include <sys/ucontext.h>
 
 #if defined(__has_include) && __has_include(<xpc/xpc.h>)
 #include <xpc/xpc.h>
 #endif  // #if defined(__has_include) && __has_include(<xpc/xpc.h>)
 
 typedef long long_t;
 
TSAN_INTERCEPTOR(void, os_lock_unlock, void *lock) {
   if (!cur_thread()->is_inited) {
     return REAL(os_lock_unlock)(lock);
   }
   SCOPED_TSAN_INTERCEPTOR(os_lock_unlock, lock);
   Release(thr, pc, (uptr)lock);
   REAL(os_lock_unlock)(lock);
 }
 
-TSAN_INTERCEPTOR(void, os_unfair_lock_lock, os_unfair_lock_t lock) {
+extern "C" {
+  #define _LOCK_AVAILABILITY \
+    __OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0) \
+    __TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0)
+
+  _LOCK_AVAILABILITY void os_unfair_lock_lock(void *lock);
+  // NOTE: `options` actually has type `os_unfair_lock_options_t` but this
+  // should be ABI compatible.
+  _LOCK_AVAILABILITY void os_unfair_lock_lock_with_options(void *lock,
+                                                           u32 options);
+  _LOCK_AVAILABILITY bool os_unfair_lock_trylock(void *lock);
+  _LOCK_AVAILABILITY void os_unfair_lock_unlock(void *lock);
+}
+
+TSAN_INTERCEPTOR(void, os_unfair_lock_lock, void *lock) {
   if (!cur_thread()->is_inited || cur_thread()->is_dead) {
     return REAL(os_unfair_lock_lock)(lock);
   }
   SCOPED_TSAN_INTERCEPTOR(os_unfair_lock_lock, lock);
   REAL(os_unfair_lock_lock)(lock);
   Acquire(thr, pc, (uptr)lock);
 }
 
-TSAN_INTERCEPTOR(void, os_unfair_lock_lock_with_options, os_unfair_lock_t lock,
+TSAN_INTERCEPTOR(void, os_unfair_lock_lock_with_options, void *lock,
                  u32 options) {
   if (!cur_thread()->is_inited || cur_thread()->is_dead) {
     return REAL(os_unfair_lock_lock_with_options)(lock, options);
   }
   SCOPED_TSAN_INTERCEPTOR(os_unfair_lock_lock_with_options, lock, options);
   REAL(os_unfair_lock_lock_with_options)(lock, options);
   Acquire(thr, pc, (uptr)lock);
 }
 
-TSAN_INTERCEPTOR(bool, os_unfair_lock_trylock, os_unfair_lock_t lock) {
+TSAN_INTERCEPTOR(bool, os_unfair_lock_trylock, void *lock) {
   if (!cur_thread()->is_inited || cur_thread()->is_dead) {
     return REAL(os_unfair_lock_trylock)(lock);
   }
   SCOPED_TSAN_INTERCEPTOR(os_unfair_lock_trylock, lock);
   bool result = REAL(os_unfair_lock_trylock)(lock);
   if (result)
     Acquire(thr, pc, (uptr)lock);
   return result;
 }
 
-TSAN_INTERCEPTOR(void, os_unfair_lock_unlock, os_unfair_lock_t lock) {
+TSAN_INTERCEPTOR(void, os_unfair_lock_unlock, void *lock) {
   if (!cur_thread()->is_inited || cur_thread()->is_dead) {
     return REAL(os_unfair_lock_unlock)(lock);
   }
   SCOPED_TSAN_INTERCEPTOR(os_unfair_lock_unlock, lock);
   Release(thr, pc, (uptr)lock);
   REAL(os_unfair_lock_unlock)(lock);
 }