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