tools/clang/plugins/FindBadConstructsConsumer.cpp

diff --git a/tools/clang/plugins/FindBadConstructsConsumer.cpp b/tools/clang/plugins/FindBadConstructsConsumer.cpp
index cb674ce..2bf41d51 100644
--- a/tools/clang/plugins/FindBadConstructsConsumer.cpp
+++ b/tools/clang/plugins/FindBadConstructsConsumer.cpp
@@ -332,12 +332,7 @@
   if (max_enumerators.find(max_value) == max_enumerators.end()) {
     ReportIfSpellingLocNotIgnored(max_value->getLocation(),
                                   diag_bad_enum_max_value_)
-#if defined(LLVM_FORCE_HEAD_REVISION)
         << toString(max_seen, 10);
-#else
-        // TODO(crbug.com/1218876): Remove after clang roll.
-        << max_seen.toString(10);
-#endif
   } else if (max_enumerators.size() < 2) {
     ReportIfSpellingLocNotIgnored(decl->getLocation(),
                                   diag_enum_max_value_unique_);

tools/clang/scripts/update.py

diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 49e793a..6023cb8 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -39,7 +39,7 @@
 # https://chromium.googlesource.com/chromium/src/+/main/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-13-init-12576-g643b6407'
+CLANG_REVISION = 'llvmorg-13-init-12881-g4017d033'
 CLANG_SUB_REVISION = 1
 
 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)