Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4debugging.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4functionobject_p.h
	src/qml/jsruntime/qv4qobjectwrapper.cpp
	src/quick/scenegraph/shaders/visualization.frag
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30

1 files changed, 16 insertions, 10 deletions

diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index d89ea07087..c0a14a5c80 100644
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -2543,17 +2543,21 @@ public:
             } else if (m->source->asConvert()) {
                 break;
             } else if (Binop *b = m->source->asBinop()) {
+                bool iterateOnOperands = true;
+
                 switch (b->op) {
+                case OpSub:
+                case OpMul:
                 case OpAdd:
-                    if (b->left->type & NumberType || b->right->type & NumberType)
+                    if (b->left->type == SInt32Type && b->right->type == SInt32Type) {
+                        iterateOnOperands = false;
                         break;
-                    else
+                    } else {
                         continue;
+                    }
                 case OpBitAnd:
                 case OpBitOr:
                 case OpBitXor:
-                case OpSub:
-                case OpMul:
                 case OpLShift:
                 case OpRShift:
                 case OpURShift:
@@ -2561,10 +2565,13 @@ public:
                 default:
                     continue;
                 }
-                if (Temp *lt = b->left->asTemp())
-                    candidates.append(*lt);
-                if (Temp *rt = b->right->asTemp())
-                    candidates.append(*rt);
+
+                if (iterateOnOperands) {
+                    if (Temp *lt = b->left->asTemp())
+                        candidates.append(*lt);
+                    if (Temp *rt = b->right->asTemp())
+                        candidates.append(*rt);
+                }
             } else if (Unop *u = m->source->asUnop()) {
                 if (u->op == OpCompl || u->op == OpUPlus) {
                     if (Temp *t = u->expr->asTemp())
@@ -4033,8 +4040,7 @@ void optimizeSSA(StatementWorklist &W, DefUses &defUses, DominatorTree &df)
                         default:
                             break;
                         }
-                        if (casted) {
-                            Q_ASSERT(casted->type == SInt32Type);
+                        if (casted && casted->type == SInt32Type) {
                             m->source = casted;
                             W += m;
                             continue;