Rebase Rust changes on LLVM head

cmake/config-ix.cmake

@@ -290,6 +290,7 @@ if(APPLE)
  set(SANITIZER_COMMON_SUPPORTED_OS osx)
  set(BUILTIN_SUPPORTED_OS osx)
  set(PROFILE_SUPPORTED_OS osx)
+ set(TSAN_SUPPORTED_OS osx)
  if(NOT SANITIZER_MIN_OSX_VERSION)
  string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
  MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
@@ -547,6 +548,13 @@ else()
  set(COMPILER_RT_HAS_TSAN FALSE)
 endif()
 
+if(APPLE)
+ option(COMPILER_RT_ENABLE_TSAN_OSX "Enable building TSan for OS X - Experimental" Off)
+ if(COMPILER_RT_ENABLE_TSAN_OSX)
+ set(COMPILER_RT_HAS_TSAN TRUE)
+ endif()
+endif()
+
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
  OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows")
  set(COMPILER_RT_HAS_UBSAN TRUE)

include/sanitizer/common_interface_defs.h

@@ -105,6 +105,12 @@ extern "C" {
  int __sanitizer_verify_contiguous_container(const void *beg, const void *mid,
  const void *end);
 
+ // Similar to __sanitizer_verify_contiguous_container but returns the address
+ // of the first improperly poisoned byte otherwise. Returns null if the area
+ // is poisoned properly.
+ const void *__sanitizer_contiguous_container_find_bad_address(
+ const void *beg, const void *mid, const void *end);
+
  // Print the stack trace leading to this call. Useful for debugging user code.
  void __sanitizer_print_stack_trace();
 

lib/asan/asan_fake_stack.h

@@ -155,7 +155,7 @@ class FakeStack {
  void ForEachFakeFrame(RangeIteratorCallback callback, void *arg);
 
  private:
- FakeStack() = default;
+ FakeStack() { }
  static const uptr kFlagsOffset = 4096; // This is were the flags begin.
  // Must match the number of uses of DEFINE_STACK_MALLOC_FREE_WITH_CLASS_ID
  COMPILER_CHECK(kNumberOfSizeClasses == 11);

lib/asan/asan_mac.cc

@@ -33,17 +33,17 @@ extern "C" {
 #endif
 
 #include <dlfcn.h> // for dladdr()
+#include <fcntl.h>
+#include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
+#include <pthread.h>
+#include <stdlib.h> // for free()
 #include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ucontext.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdlib.h> // for free()
 #include <unistd.h>
-#include <libkern/OSAtomic.h>
 
 namespace __asan {