diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-04 05:51:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-04 05:51:21 +0000 |
| commit | a562f633ea4f6c9d22e7fcc64e21e8bd01408cd0 (patch) | |
| tree | 34058fb1a9de5911041aa9358af0056ec19e118a | |
| parent | 70a1fcf5cbdb2efc1be5d8ebc23aa75ccaecc94c (diff) | |
| parent | 6a81494f375b6adbdf9425b46dcad0aef7a1e96b (diff) | |
| download | clang-a562f633ea4f6c9d22e7fcc64e21e8bd01408cd0.tar.gz | |
Merge "Fix -Wbitwise-instead-of-logical" am: 11addfade5 am: 6a81494f37
Original change: https://android-review.googlesource.com/c/platform/external/clang/+/1971006
Change-Id: Icf834dbb12d5dc416edf51711844ce15eefd2932
| -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()); } }; |