Rename SetExceptionHandler to SetUnwindHandler

It's being used for more than just exception handling,
unwinding for return or break/continue statements also
goes through those handlers.

Change-Id: I145c7909540a1adca431de6a98d9c115ddf23612
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp
index 79e6312b26..a32039dc96 100644
--- a/src/qml/jit/qv4assembler.cpp
+++ b/src/qml/jit/qv4assembler.cpp
@@ -2228,14 +2228,14 @@ void Assembler::setException()
     pasm()->store8(TrustedImm32(1), addr);
 }
 
-void Assembler::setExceptionHandler(int offset)
+void Assembler::setUnwindHandler(int offset)
 {
     auto l = pasm()->storePtrWithPatch(TrustedImmPtr(nullptr), pasm()->exceptionHandlerAddress());
     pasm()->ehTargets.push_back({ l, offset });
 }
 
 
-void Assembler::clearExceptionHandler()
+void Assembler::clearUnwindHandler()
 {
     pasm()->storePtr(TrustedImmPtr(nullptr), pasm()->exceptionHandlerAddress());
 }
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h
index a1596e1640..73faf7b69f 100644
--- a/src/qml/jit/qv4assembler_p.h
+++ b/src/qml/jit/qv4assembler_p.h
@@ -162,8 +162,8 @@ public:
     void gotoCatchException();
     void getException();
     void setException();
-    void setExceptionHandler(int offset);
-    void clearExceptionHandler();
+    void setUnwindHandler(int offset);
+    void clearUnwindHandler();
     void pushCatchContext(int index, int name);
     void popContext();
 
diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp
index d8f0976774..031c6e620c 100644
--- a/src/qml/jit/qv4baselinejit.cpp
+++ b/src/qml/jit/qv4baselinejit.cpp
@@ -553,12 +553,12 @@ void BaselineJIT::generate_CallContextObjectProperty(int propIdx, int base, int
     as->checkException();
 }
 
-void BaselineJIT::generate_SetExceptionHandler(int offset)
+void BaselineJIT::generate_SetUnwindHandler(int offset)
 {
     if (offset)
-        as->setExceptionHandler(instructionOffset() + offset);
+        as->setUnwindHandler(instructionOffset() + offset);
     else
-        as->clearExceptionHandler();
+        as->clearUnwindHandler();
 }
 
 void BaselineJIT::generate_ThrowException()
diff --git a/src/qml/jit/qv4baselinejit_p.h b/src/qml/jit/qv4baselinejit_p.h
index c83b985bd6..96fd8348b8 100644
--- a/src/qml/jit/qv4baselinejit_p.h
+++ b/src/qml/jit/qv4baselinejit_p.h
@@ -128,7 +128,7 @@ public:
     void generate_CallGlobalLookup(int index, int argc, int argv) override;
     void generate_CallScopeObjectProperty(int propIdx, int base, int argc, int argv) override;
     void generate_CallContextObjectProperty(int propIdx, int base, int argc, int argv) override;
-    void generate_SetExceptionHandler(int offset) override;
+    void generate_SetUnwindHandler(int offset) override;
     void generate_ThrowException() override;
     void generate_GetException() override;
     void generate_SetException() override;