1 files changed, 22 insertions, 22 deletions
diff --git a/src/qml/compiler/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp
index be10d50e9b..edd8425678 100644
--- a/src/qml/compiler/qv4isel_moth.cpp
+++ b/src/qml/compiler/qv4isel_moth.cpp
@@ -54,7 +54,7 @@ using namespace QV4::Moth;
 
 namespace {
 
-inline QV4::Runtime::BinaryOperation aluOpFunction(IR::AluOp op)
+inline uint aluOpFunction(IR::AluOp op)
 {
     switch (op) {
     case IR::OpInvalid:
@@ -70,43 +70,43 @@ inline QV4::Runtime::BinaryOperation aluOpFunction(IR::AluOp op)
     case IR::OpCompl:
         return 0;
     case IR::OpBitAnd:
-        return QV4::Runtime::bitAnd;
+        return offsetof(QV4::Runtime, bitAnd);
     case IR::OpBitOr:
-        return QV4::Runtime::bitOr;
+        return offsetof(QV4::Runtime, bitOr);
     case IR::OpBitXor:
-        return QV4::Runtime::bitXor;
+        return offsetof(QV4::Runtime, bitXor);
     case IR::OpAdd:
         return 0;
     case IR::OpSub:
-        return QV4::Runtime::sub;
+        return offsetof(QV4::Runtime, sub);
     case IR::OpMul:
-        return QV4::Runtime::mul;
+        return offsetof(QV4::Runtime, mul);
     case IR::OpDiv:
-        return QV4::Runtime::div;
+        return offsetof(QV4::Runtime, div);
     case IR::OpMod:
-        return QV4::Runtime::mod;
+        return offsetof(QV4::Runtime, mod);
     case IR::OpLShift:
-        return QV4::Runtime::shl;
+        return offsetof(QV4::Runtime, shl);
     case IR::OpRShift:
-        return QV4::Runtime::shr;
+        return offsetof(QV4::Runtime, shr);
     case IR::OpURShift:
-        return QV4::Runtime::ushr;
+        return offsetof(QV4::Runtime, ushr);
     case IR::OpGt:
-        return QV4::Runtime::greaterThan;
+        return offsetof(QV4::Runtime, greaterThan);
     case IR::OpLt:
-        return QV4::Runtime::lessThan;
+        return offsetof(QV4::Runtime, lessThan);
     case IR::OpGe:
-        return QV4::Runtime::greaterEqual;
+        return offsetof(QV4::Runtime, greaterEqual);
     case IR::OpLe:
-        return QV4::Runtime::lessEqual;
+        return offsetof(QV4::Runtime, lessEqual);
     case IR::OpEqual:
-        return QV4::Runtime::equal;
+        return offsetof(QV4::Runtime, equal);
     case IR::OpNotEqual:
-        return QV4::Runtime::notEqual;
+        return offsetof(QV4::Runtime, notEqual);
     case IR::OpStrictEqual:
-        return QV4::Runtime::strictEqual;
+        return offsetof(QV4::Runtime, strictEqual);
     case IR::OpStrictNotEqual:
-        return QV4::Runtime::strictNotEqual;
+        return offsetof(QV4::Runtime, strictNotEqual);
     case IR::OpInstanceof:
         return 0;
     case IR::OpIn:
@@ -1040,11 +1040,11 @@ Param InstructionSelection::binopHelper(IR::AluOp oper, IR::Expr *leftSource, IR
     if (oper == IR::OpInstanceof || oper == IR::OpIn || oper == IR::OpAdd) {
         Instruction::BinopContext binop;
         if (oper == IR::OpInstanceof)
-            binop.alu = QV4::Runtime::instanceof;
+            binop.alu = offsetof(QV4::Runtime, instanceof);
         else if (oper == IR::OpIn)
-            binop.alu = QV4::Runtime::in;
+            binop.alu = offsetof(QV4::Runtime, in);
         else
-            binop.alu = QV4::Runtime::add;
+            binop.alu = offsetof(QV4::Runtime, add);
         binop.lhs = getParam(leftSource);
         binop.rhs = getParam(rightSource);
         binop.result = getResultParam(target);