diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2022-03-09 09:04:47 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-09 22:31:34 +0000 |
| commit | 7eac1be682b68be8468f1c07dd1867b1805ca068 (patch) | |
| tree | 5ae745debee5a1f492d14ae4676333a884d935ab | |
| parent | afdc5761922162adfd7e86f6a460ff4013a1a68e (diff) | |
masm: Repace bitwise | with || in bool expression in X86Assembler.h
Produces a warning with clang 15 on Ubuntu:
/home/ag/work/qt5/qtdeclarative/src/qml/../3rdparty/masm/assembler/X86Assembler.h:2368:23: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
emitRexIf(byteRegRequiresRex(reg)|byteRegRequiresRex(rm), reg, 0, rm);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Similar logic already uses || so this seems to be a typo.
Change-Id: Ie539600e28748d902fbb443e47892a703003c7e6
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit e86019ecbddd76d6551a18595ef9dcff8560f1d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/3rdparty/masm/assembler/X86Assembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h index c6705f3265..07a883397a 100644 --- a/src/3rdparty/masm/assembler/X86Assembler.h +++ b/src/3rdparty/masm/assembler/X86Assembler.h @@ -2365,7 +2365,7 @@ private: void twoByteOp8(TwoByteOpcodeID opcode, RegisterID reg, RegisterID rm) { m_buffer.ensureSpace(maxInstructionSize); - emitRexIf(byteRegRequiresRex(reg)|byteRegRequiresRex(rm), reg, 0, rm); + emitRexIf(byteRegRequiresRex(reg) || byteRegRequiresRex(rm), reg, 0, rm); m_buffer.putByteUnchecked(OP_2BYTE_ESCAPE); m_buffer.putByteUnchecked(opcode); registerModRM(reg, rm); |