Skip to content

Commit

Permalink
Roll clang 318667:320471.
Browse files Browse the repository at this point in the history
Bug: 787920

Cq-Include-Trybots: master.tryserver.chromium.android:android_arm64_dbg_recipe;master.tryserver.chromium.android:android_compile_x64_dbg;master.tryserver.chromium.android:android_compile_x86_dbg
Change-Id: Ifcb76b0d95acc65eafbf58da624f9fbc920f7924
Reviewed-on: https://chromium-review.googlesource.com/823219
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523910}
  • Loading branch information
zmodem authored and Commit Bot committed Dec 13, 2017
1 parent f91dd2e commit b592ae8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions sandbox/linux/tests/unit_tests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,7 @@ void UnitTests::RunTestInProcess(SandboxTestRunner* test_runner,
// We need to fork(), so we can't be multi-threaded, as threads could hold
// locks.
int num_threads = CountThreads();
#if !defined(THREAD_SANITIZER)
const int kNumExpectedThreads = 1;
#else
// Under TSAN, there is a special helper thread. It should be completely
// invisible to our testing, so we ignore it. It should be ok to fork()
// with this thread. It's currently buggy, but it's the best we can do until
// there is a way to delay the start of the thread
// (https://code.google.com/p/thread-sanitizer/issues/detail?id=19).
const int kNumExpectedThreads = 2;
#endif

// The kernel is at liberty to wake a thread id futex before updating /proc.
// If another test running in the same process has stopped a thread, it may
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/scripts/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# Do NOT CHANGE this if you don't know what you're doing -- see
# https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '318667'
CLANG_REVISION = '320471'

use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
in ('1', 'YES'))
Expand Down

0 comments on commit b592ae8

Please sign in to comment.