1 files changed, 31 insertions, 32 deletions

diff --git a/src/qml/jit/qv4baselinejit_p.h b/src/qml/jit/qv4baselinejit_p.h
index 37ab37eac2..284faf0ff0 100644
--- a/src/qml/jit/qv4baselinejit_p.h
+++ b/src/qml/jit/qv4baselinejit_p.h
@@ -56,7 +56,7 @@
 #include <private/qv4instr_moth_p.h>
 #include <private/qv4bytecodehandler_p.h>
 
-//QT_REQUIRE_CONFIG(qml_jit);
+QT_REQUIRE_CONFIG(qml_jit);
 
 QT_BEGIN_NAMESPACE
 
@@ -65,7 +65,6 @@ namespace JIT {
 
 class BaselineAssembler;
 
-#ifdef V4_ENABLE_JIT
 class BaselineJIT final: public Moth::ByteCodeHandler
 {
 public:
@@ -88,22 +87,22 @@ public:
     void generate_StoreReg(int reg) override;
     void generate_MoveReg(int srcReg, int destReg) override;
     void generate_LoadImport(int index) override;
-    void generate_LoadLocal(int index, int traceSlot) override;
+    void generate_LoadLocal(int index) override;
     void generate_StoreLocal(int index) override;
-    void generate_LoadScopedLocal(int scope, int index, int traceSlot) override;
+    void generate_LoadScopedLocal(int scope, int index) override;
     void generate_StoreScopedLocal(int scope, int index) override;
     void generate_LoadRuntimeString(int stringId) override;
     void generate_MoveRegExp(int regExpId, int destReg) override;
     void generate_LoadClosure(int value) override;
-    void generate_LoadName(int name, int traceSlot) override;
-    void generate_LoadGlobalLookup(int index, int traceSlot) override;
-    void generate_LoadQmlContextPropertyLookup(int index, int traceSlot) override;
+    void generate_LoadName(int name) override;
+    void generate_LoadGlobalLookup(int index) override;
+    void generate_LoadQmlContextPropertyLookup(int index) override;
     void generate_StoreNameSloppy(int name) override;
     void generate_StoreNameStrict(int name) override;
-    void generate_LoadElement(int base, int traceSlot) override;
-    void generate_StoreElement(int base, int index, int traceSlot) override;
-    void generate_LoadProperty(int name, int traceSlot) override;
-    void generate_GetLookup(int index, int traceSlot) override;
+    void generate_LoadElement(int base) override;
+    void generate_StoreElement(int base, int index) override;
+    void generate_LoadProperty(int name) override;
+    void generate_GetLookup(int index) override;
     void generate_StoreProperty(int name, int base) override;
     void generate_SetLookup(int index, int base) override;
     void generate_LoadSuperProperty(int property) override;
@@ -112,16 +111,16 @@ public:
     void generate_YieldStar() override;
     void generate_Resume(int) override;
 
-    void generate_CallValue(int name, int argc, int argv, int traceSlot) override;
-    void generate_CallWithReceiver(int name, int thisObject, int argc, int argv, int traceSlot) override;
-    void generate_CallProperty(int name, int base, int argc, int argv, int traceSlot) override;
-    void generate_CallPropertyLookup(int lookupIndex, int base, int argc, int argv, int traceSlot) override;
-    void generate_CallElement(int base, int index, int argc, int argv, int traceSlot) override;
-    void generate_CallName(int name, int argc, int argv, int traceSlot) override;
-    void generate_CallPossiblyDirectEval(int argc, int argv, int traceSlot) override;
-    void generate_CallGlobalLookup(int index, int argc, int argv, int traceSlot) override;
-    void generate_CallQmlContextPropertyLookup(int index, int argc, int argv, int traceSlot) override;
-    void generate_CallWithSpread(int func, int thisObject, int argc, int argv, int traceSlot) override;
+    void generate_CallValue(int name, int argc, int argv) override;
+    void generate_CallWithReceiver(int name, int thisObject, int argc, int argv) override;
+    void generate_CallProperty(int name, int base, int argc, int argv) override;
+    void generate_CallPropertyLookup(int lookupIndex, int base, int argc, int argv) override;
+    void generate_CallElement(int base, int index, int argc, int argv) override;
+    void generate_CallName(int name, int argc, int argv) override;
+    void generate_CallPossiblyDirectEval(int argc, int argv) override;
+    void generate_CallGlobalLookup(int index, int argc, int argv) override;
+    void generate_CallQmlContextPropertyLookup(int index, int argc, int argv) override;
+    void generate_CallWithSpread(int func, int thisObject, int argc, int argv) override;
     void generate_TailCall(int func, int thisObject, int argc, int argv) override;
     void generate_Construct(int func, int argc, int argv) override;
     void generate_ConstructWithSpread(int func, int argc, int argv) override;
@@ -160,10 +159,11 @@ public:
     void generate_LoadSuperConstructor() override;
     void generate_ToObject() override;
     void generate_Jump(int offset) override;
-    void generate_JumpTrue(int traceSlot, int offset) override;
-    void generate_JumpFalse(int traceSlot, int offset) override;
+    void generate_JumpTrue(int offset) override;
+    void generate_JumpFalse(int offset) override;
     void generate_JumpNoException(int offset) override;
     void generate_JumpNotUndefined(int offset) override;
+    void generate_CheckException() override;
     void generate_CmpEqNull() override;
     void generate_CmpNeNull() override;
     void generate_CmpEqInt(int lhs) override;
@@ -179,12 +179,12 @@ public:
     void generate_CmpIn(int lhs) override;
     void generate_CmpInstanceOf(int lhs) override;
     void generate_UNot() override;
-    void generate_UPlus(int) override;
-    void generate_UMinus(int traceSlot) override;
+    void generate_UPlus() override;
+    void generate_UMinus() override;
     void generate_UCompl() override;
-    void generate_Increment(int traceSlot) override;
-    void generate_Decrement(int traceSlot) override;
-    void generate_Add(int lhs, int traceSlot) override;
+    void generate_Increment() override;
+    void generate_Decrement() override;
+    void generate_Add(int lhs) override;
     void generate_BitAnd(int lhs) override;
     void generate_BitOr(int lhs) override;
     void generate_BitXor(int lhs) override;
@@ -198,10 +198,10 @@ public:
     void generate_ShrConst(int rhs) override;
     void generate_ShlConst(int rhs) override;
     void generate_Exp(int lhs) override;
-    void generate_Mul(int lhs, int traceSlot) override;
+    void generate_Mul(int lhs) override;
     void generate_Div(int lhs) override;
-    void generate_Mod(int lhs, int traceSlot) override;
-    void generate_Sub(int lhs, int traceSlot) override;
+    void generate_Mod(int lhs) override;
+    void generate_Sub(int lhs) override;
     void generate_InitializeBlockDeadTemporalZone(int firstReg, int count) override;
     void generate_ThrowOnNullOrUndefined() override;
     void generate_GetTemplateObject(int index) override;
@@ -214,7 +214,6 @@ private:
     QScopedPointer<BaselineAssembler> as;
     QSet<int> labels;
 };
-#endif // V4_ENABLE_JIT
 
 } // namespace JIT
 } // namespace QV4