diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-04 06:22:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-04 06:22:44 +0000 |
| commit | 399eb7393391290f4e472f4b34c7c32493058e8f (patch) | |
| tree | 34058fb1a9de5911041aa9358af0056ec19e118a | |
| parent | 73437714b51915ae6ffda9179ede6665156a5e30 (diff) | |
| parent | fe451aec7d4aa4fd018f3a0b23bfe5a708d5150f (diff) | |
| download | clang-399eb7393391290f4e472f4b34c7c32493058e8f.tar.gz | |
Merge "Fix -Wbitwise-instead-of-logical" am: 11addfade5 am: 6a81494f37 am: a562f633ea am: fe451aec7d
Original change: https://android-review.googlesource.com/c/platform/external/clang/+/1971006
Change-Id: Ie455e418f1f98d2dc91c640ec9bc127da92e9559
| -rw-r--r-- | include/clang/Basic/IdentifierTable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h index fffb50493b..c71df832ac 100644 --- a/include/clang/Basic/IdentifierTable.h +++ b/include/clang/Basic/IdentifierTable.h @@ -358,8 +358,8 @@ private: /// change to it should be reflected here. void RecomputeNeedsHandleIdentifier() { NeedsHandleIdentifier = - (isPoisoned() | hasMacroDefinition() | isCPlusPlusOperatorKeyword() | - isExtensionToken() | isFutureCompatKeyword() || isOutOfDate() || + (isPoisoned() || hasMacroDefinition() || isCPlusPlusOperatorKeyword() || + isExtensionToken() || isFutureCompatKeyword() || isOutOfDate() || isModulesImport()); } }; |