commit 6bc42e8178d99a88a02b6dc9a590f3828d8349a2
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 21 22:17:54 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Mar 21 22:17:54 2022 -0700
tree 34058fb1a9de5911041aa9358af0056ec19e118a
parent 67f3337b8481a8b63c4482bd8fe00a9e145ecfbe
parent 2e1b197f4887d4629439ea05ab1a2d9674f22df0

Merge 2e1b197f4887d4629439ea05ab1a2d9674f22df0 on remote branch

Change-Id: Ifef4c324cb0a1865ad93555bce882f0ddc0618ff

include/clang/Basic/IdentifierTable.h

diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index fffb504..c71df83 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -358,8 +358,8 @@
   /// change to it should be reflected here.
   void RecomputeNeedsHandleIdentifier() {
     NeedsHandleIdentifier =
-      (isPoisoned() | hasMacroDefinition() | isCPlusPlusOperatorKeyword() |
-       isExtensionToken() | isFutureCompatKeyword() || isOutOfDate() ||
+      (isPoisoned() || hasMacroDefinition() || isCPlusPlusOperatorKeyword() ||
+       isExtensionToken() || isFutureCompatKeyword() || isOutOfDate() ||
        isModulesImport());
   }
 };