Changeset 237728 in webkit for trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

Timestamp:

Nov 2, 2018, 3:46:34 AM (7 years ago)

Author:

Tadeu Zagallo

Message:

REGRESSION(r237547): Exception handlers should be aware of wide opcodes when JIT is disabled
​https://bugs.webkit.org/show_bug.cgi?id=191175

Reviewed by Keith Miller.

​https://bugs.webkit.org/show_bug.cgi?id=191108 did not handle the case where JIT is not enabled

• jit/JITExceptions.cpp:

(JSC::genericUnwind):

• llint/LLIntData.h:

(JSC::LLInt::getWideCodePtr):

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -74 +74 @@
         catchRoutine = handler->nativeCode.executableAddress();
 #else
-        catchRoutine = LLInt::getCodePtr(catchPCForInterpreter->opcodeID());
+        catchRoutine = catchPCForInterpreter->isWide()
+            ? LLInt::getWideCodePtr(catchPCForInterpreter->opcodeID())
+            : LLInt::getCodePtr(catchPCForInterpreter->opcodeID());
 #endif
     } else