Commit 8ad4334a authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Roll clang llvmorg-12-init-5627-gf086e85e-3 : llvmorg-12-init-10666-gc9f69ee7-1.

Ran `./tools/clang/scripts/upload_revision.py c9f69ee7`.

Disable ArcDataSnapshotdManagerBasicTest.RestoredAfterCrash under msan
since it has uninitialized memory accesses that the new compiler
identifies (https://crbug.com/1144452)

Bug: 1126953,1144452
Change-Id: I8e526de19b723ac7a4b5ca36c511d70378b7f68f
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_angle_deqp_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_asan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_compile_dbg_32_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:win-angle-deqp-rel-64
Cq-Include-Trybots: chromium/try:win-asan,win7-rel,win-angle-deqp-rel-32
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win64-chrome,mac-chrome
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518420
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824053}
parent d1c5c924
......@@ -239,7 +239,13 @@ TEST_F(ArcDataSnapshotdManagerBasicTest, UpstartFailures) {
EXPECT_FALSE(manager.bridge());
}
TEST_F(ArcDataSnapshotdManagerBasicTest, RestoredAfterCrash) {
#if defined(MEMORY_SANITIZER)
// https://crbug.com/1144452
#define MAYBE_RestoredAfterCrash DISABLED_RestoredAfterCrash
#else
#define MAYBE_RestoredAfterCrash RestoredAfterCrash
#endif
TEST_F(ArcDataSnapshotdManagerBasicTest, MAYBE_RestoredAfterCrash) {
SetUpRestoredSessionCommandLine();
// The attempt to stop the daemon, started before crash.
ExpectStopDaemon(true /*success */);
......
......@@ -30,9 +30,6 @@ class SuppressibleDiagnosticBuilder : public clang::DiagnosticBuilder {
// doesn't try to emit the diagnostic.
// TODO(crbug.com/1140409) Remove in the next Clang roll.
#ifndef LLVM_FORCE_HEAD_REVISION
FlushCounts();
#endif
Clear();
// Also clear the current diagnostic being processed by the
// DiagnosticsEngine, since it won't be emitted.
......@@ -41,16 +38,6 @@ class SuppressibleDiagnosticBuilder : public clang::DiagnosticBuilder {
}
// TODO(crbug.com/1140409) Remove in the next Clang roll.
#ifndef LLVM_FORCE_HEAD_REVISION
template <typename T>
friend const SuppressibleDiagnosticBuilder& operator<<(
const SuppressibleDiagnosticBuilder& builder,
const T& value) {
const DiagnosticBuilder& base_builder = builder;
base_builder << value;
return builder;
}
#endif
private:
clang::DiagnosticsEngine* const diagnostics_;
......
......@@ -38,8 +38,8 @@ import zipfile
# https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
# This is the output of `git describe` and is usable as a commit-ish.
CLANG_REVISION = 'llvmorg-12-init-5627-gf086e85e'
CLANG_SUB_REVISION = 3
CLANG_REVISION = 'llvmorg-12-init-10666-gc9f69ee7'
CLANG_SUB_REVISION = 1
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
RELEASE_VERSION = '12.0.0'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment