5 files changed, 0 insertions, 17 deletions
diff --git a/src/qml/compiler/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp
index 110076b3e3..ba1e2f5a23 100644
--- a/src/qml/compiler/qv4instr_moth.cpp
+++ b/src/qml/compiler/qv4instr_moth.cpp
@@ -330,9 +330,6 @@ void dumpBytecode(const char *code, int len, int nLocals, int nFormals, int star
         MOTH_BEGIN_INSTR(SetException)
         MOTH_END_INSTR(SetExceptionFlag)
 
-        MOTH_BEGIN_INSTR(UnwindException)
-        MOTH_END_INSTR(UnwindException)
-
         MOTH_BEGIN_INSTR(PushCatchContext)
             d << StackSlot::dump(reg, nFormals) << ", " << name;
         MOTH_END_INSTR(PushCatchContext)
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 8c00c7e5a9..b8d62fac08 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -120,7 +120,6 @@ QT_BEGIN_NAMESPACE
 #define INSTR_ThrowException(op) INSTRUCTION(op, ThrowException, 0)
 #define INSTR_GetException(op) INSTRUCTION(op, GetException, 0)
 #define INSTR_SetException(op) INSTRUCTION(op, SetException, 0)
-#define INSTR_UnwindException(op) INSTRUCTION(op, UnwindException, 0)
 #define INSTR_PushCatchContext(op) INSTRUCTION(op, PushCatchContext, 2, name, reg)
 #define INSTR_PushWithContext(op) INSTRUCTION(op, PushWithContext, 1, reg)
 #define INSTR_PopContext(op) INSTRUCTION(op, PopContext, 1, reg)
@@ -234,7 +233,6 @@ QT_BEGIN_NAMESPACE
     F(ThrowException) \
     F(GetException) \
     F(SetException) \
-    F(UnwindException) \
     F(PushCatchContext) \
     F(PushWithContext) \
     F(PopContext) \
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 115129672d..6f82e0b98a 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -1177,13 +1177,6 @@ QV4::ReturnedValue Runtime::method_typeofName(ExecutionEngine *engine, int nameI
     return method_typeofValue(engine, prop);
 }
 
-ReturnedValue Runtime::method_unwindException(ExecutionEngine *engine)
-{
-    if (!engine->hasException)
-        return Primitive::emptyValue().asReturnedValue();
-    return engine->catchException(0);
-}
-
 /* The next three methods are a bit tricky. They can't open up a Scope, as that
  * would mess up the pushing of the context.
  *
diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h
index 68ac28919d..963dffe0c9 100644
--- a/src/qml/jsruntime/qv4runtimeapi_p.h
+++ b/src/qml/jsruntime/qv4runtimeapi_p.h
@@ -124,7 +124,6 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> {
     \
     /* exceptions & scopes */ \
     F(void, throwException, (ExecutionEngine *engine, const Value &value)) \
-    F(ReturnedValue, unwindException, (ExecutionEngine *engine)) \
     F(ReturnedValue, createWithContext, (ExecutionContext *parent, const Value &o)) \
     F(ReturnedValue, createCatchContext, (ExecutionContext *parent, int exceptionVarNameIndex)) \
     \
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 37d2e52fb5..a8b3178cc8 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -820,10 +820,6 @@ QV4::ReturnedValue VME::exec(const FunctionObject *jsFunction, CallData *callDat
         engine->hasException = true;
     MOTH_END_INSTR(SetException)
 
-    MOTH_BEGIN_INSTR(UnwindException)
-        acc = Runtime::method_unwindException(engine);
-    MOTH_END_INSTR(UnwindException)
-
     MOTH_BEGIN_INSTR(PushCatchContext)
         STACK_VALUE(reg) = STACK_VALUE(JSStackFrame::Context);
         ExecutionContext *c = static_cast<ExecutionContext *>(stack + JSStackFrame::Context);