V4: remove inplace operations

Inplace operations are expanded when building the IR, so the neither the
IR, nor the instruction selection backends or runtime need to handle
them.

Change-Id: Id01f9544e137dd52364cf2ed2c10931c31ddfff3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 74aa0892f9..0f60bdc9f3 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -655,24 +655,23 @@ void Codegen::move(V4IR::Expr *target, V4IR::Expr *source, V4IR::AluOp op)
 {
     assert(target->isLValue());
 
-    // TODO: verify the rest of the function for when op == OpInvalid
     if (op != V4IR::OpInvalid) {
-        move(target, binop(op, target, source), V4IR::OpInvalid);
+        move(target, binop(op, target, source));
         return;
     }
 
-    if (!source->asTemp() && !source->asConst() && (op != V4IR::OpInvalid || ! target->asTemp())) {
+    if (!source->asTemp() && !source->asConst() && !target->asTemp()) {
         unsigned t = _block->newTemp();
         _block->MOVE(_block->TEMP(t), source);
         source = _block->TEMP(t);
     }
-    if (source->asConst() && (!target->asTemp() || op != V4IR::OpInvalid)) {
+    if (source->asConst() && !target->asTemp()) {
         unsigned t = _block->newTemp();
         _block->MOVE(_block->TEMP(t), source);
         source = _block->TEMP(t);
     }
 
-    _block->MOVE(target, source, op);
+    _block->MOVE(target, source);
 }
 
 void Codegen::cjump(V4IR::Expr *cond, V4IR::BasicBlock *iftrue, V4IR::BasicBlock *iffalse)