diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:29:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-16 12:33:27 +0200 |
| commit | 9c8edb91f2c6c7de8228e018dbd1ae7a656b3097 (patch) | |
| tree | 717b1df74793af50bd6daaa6775b923a74b05063 /src/qml/jit | |
| parent | 5870667929ac5f45805b1e1e656fec81b9b22337 (diff) | |
| parent | 2b3c2339616680537145a9cc2e7567575add1abb (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4binop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jit/qv4binop.cpp b/src/qml/jit/qv4binop.cpp index a055dffcac..c6c8023cd7 100644 --- a/src/qml/jit/qv4binop.cpp +++ b/src/qml/jit/qv4binop.cpp @@ -430,13 +430,13 @@ bool Binop::int32Binop(IR::Expr *leftSource, IR::Expr *rightSource, IR::Expr *ta as->lshift32(l, Assembler::ScratchRegister, targetReg); break; - case IR::OpLShift: + case IR::OpRShift: as->move(r, Assembler::ScratchRegister); as->and32(Assembler::TrustedImm32(0x1f), Assembler::ScratchRegister); as->rshift32(l, Assembler::ScratchRegister, targetReg); break; - case IR::OpLShift: + case IR::OpURShift: as->move(r, Assembler::ScratchRegister); as->and32(Assembler::TrustedImm32(0x1f), Assembler::ScratchRegister); as->storeUInt32(targetReg, target); // IMPORTANT: do NOT do a break here! The stored type of an urshift is different from the other binary operations! |