Update WebView M40 with latest AOSP change. Merge "Cherry-pick "ARM assembler: fix undefined behaviour in fits_shifter"".
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc index c7b91c5..7048f96 100644 --- a/src/arm/assembler-arm.cc +++ b/src/arm/assembler-arm.cc
@@ -991,7 +991,8 @@ Instr* instr) { // imm32 must be unsigned. for (int rot = 0; rot < 16; rot++) { - uint32_t imm8 = (imm32 << 2*rot) | (imm32 >> (32 - 2*rot)); + uint32_t imm8 = + rot == 0 ? imm32 : (imm32 << 2 * rot) | (imm32 >> (32 - 2 * rot)); if ((imm8 <= 0xff)) { *rotate_imm = rot; *immed_8 = imm8;