Changeset 237728 in webkit

Timestamp:

Nov 2, 2018 3:46:34 AM (5 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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITExceptions.cpp (modified) (1 diff)
• llint/LLIntData.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-11-02  Tadeu Zagallo  <tzagallo@apple.com>
+
+        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):
+
 2018-11-01  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

trunk/Source/JavaScriptCore/llint/LLIntData.h

@@ -141 +141 @@
     return reinterpret_cast<void*>(getOpcode(id));
 }
+
+ALWAYS_INLINE void* getWideCodePtr(OpcodeID id)
+{
+    return reinterpret_cast<void*>(getOpcodeWide(id));
+}
 #endif