Roll clang 296321:298539.

base/native_library_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/test/native_library_test_utils.h"
 #include "build/build_config.h"
@@ skipping 82 matching lines @@
 // Verifies that we can load a native library and resolve its exported symbols.
 TEST(NativeLibraryTest, LoadLibrary) {
   TestLibrary library;
   EXPECT_EQ(5, library.Call<int>("GetSimpleTestValue"));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 // Android dlopen() requires further investigation, as it might vary across
 // versions with respect to symbol resolution scope.
-#if !defined(OS_ANDROID)
+// TSan errors out on RTLD_DEEPBIND, https://crbug.com/705255
+#if !defined(OS_ANDROID) && !defined(THREAD_SANITIZER)
 
 // Verifies that the |prefer_own_symbols| option satisfies its guarantee that
 // a loaded library will always prefer local symbol resolution before
 // considering global symbols.
 TEST(NativeLibraryTest, LoadLibraryPreferOwnSymbols) {
   NativeLibraryOptions options;
   options.prefer_own_symbols = true;
   TestLibrary library(options);
 
   // Verify that this binary and the DSO use different storage for
@@ skipping 22 matching lines @@
   EXPECT_EQ(4, library.Call<int>("NativeLibraryTestIncrement"));
   EXPECT_EQ(2, NativeLibraryTestIncrement());
   EXPECT_EQ(3, NativeLibraryTestIncrement());
 }
 
 #endif  // !defined(OS_ANDROID)
 
 #endif  // !defined(OS_IOS) && !defined(ADDRESS_SANITIZER)
 
 }  // namespace base