Updated LLVM to r412851.
Test: ./checkbuild.py && ./run_tests.py
Bug: None
Change-Id: I8c06df55008ef0548a28e3e4baeebbd9249f6058
diff --git a/docs/changelogs/Changelog-r23.md b/docs/changelogs/Changelog-r23.md
index e1e16ca..2e7b03a 100644
--- a/docs/changelogs/Changelog-r23.md
+++ b/docs/changelogs/Changelog-r23.md
@@ -20,7 +20,7 @@
## Changes
* Includes preview Android S DP 1 APIs.
-* Updated LLVM to clang-r407598b, based on LLVM 12 development.
+* Updated LLVM to clang-r412851, based on LLVM 12 development.
* [Issue 1047]: Fixes crash when using ASan with the CFI unwinder.
* [Issue 1096]: Includes support for [Polly]. Enable by adding
`-mllvm -polly` to your cflags.
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index 4e57771..aa7a9b6 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -22,7 +22,7 @@
import ndk.paths
-CLANG_VERSION = 'clang-r407598b'
+CLANG_VERSION = 'clang-r412851'
HOST_TRIPLE_MAP = {
diff --git a/tests/libc++/test/std/iterators/iterator.primitives/iterator.traits/test_config.py b/tests/libc++/test/std/iterators/iterator.primitives/iterator.traits/test_config.py
new file mode 100644
index 0000000..03bc9cf
--- /dev/null
+++ b/tests/libc++/test/std/iterators/iterator.primitives/iterator.traits/test_config.py
@@ -0,0 +1,6 @@
+def build_broken(test):
+ if test.case_name == 'empty.fail':
+ # Format of the diagnostic changed in clang and we don't have the
+ # libc++ update to match (https://reviews.llvm.org/D92239).
+ return 'all', 'https://github.com/android/ndk/issues/1454'
+ return None, None
