From e86019ecbddd76d6551a18595ef9dcff8560f1d4 Mon Sep 17 00:00:00 2001 From: Andrei Golubev Date: Wed, 9 Mar 2022 09:04:47 +0100 Subject: 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. Pick-to: 6.3 6.2 Change-Id: Ie539600e28748d902fbb443e47892a703003c7e6 Reviewed-by: Fabian Kosmale Reviewed-by: Ulf Hermann --- src/3rdparty/masm/assembler/X86Assembler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3