Changeset 237641 in webkit

Timestamp:

Oct 31, 2018, 9:39:06 AM (8 years ago)

Author:

Tadeu Zagallo

Message:

REGRESSION(r237547): Exception handlers should be aware of wide opcodes
​https://bugs.webkit.org/show_bug.cgi?id=191108
<rdar://problem/45690700>

Reviewed by Saam Barati.

JSTests:

• stress/wide-op_catch.js: Added.

(catch):

Source/JavaScriptCore:

When linking the handler, we need to check whether the target op_catch is
wide or narrow in order to chose the right code pointer for the handler.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::finishCreation):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/wide-op_catch.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2018-10-31  Tadeu Zagallo  <tzagallo@apple.com>
+
+        REGRESSION(r237547): Exception handlers should be aware of wide opcodes
+        https://bugs.webkit.org/show_bug.cgi?id=191108
+        <rdar://problem/45690700>
+
+        Reviewed by Saam Barati.
+
+        * stress/wide-op_catch.js: Added.
+        (catch):
+
 2018-10-29  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-10-31  Tadeu Zagallo  <tzagallo@apple.com>
+
+        REGRESSION(r237547): Exception handlers should be aware of wide opcodes
+        https://bugs.webkit.org/show_bug.cgi?id=191108
+        <rdar://problem/45690700>
+
+        Reviewed by Saam Barati.
+
+        When linking the handler, we need to check whether the target op_catch is
+        wide or narrow in order to chose the right code pointer for the handler.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::finishCreation):
+
 2018-10-31  Dominik Infuehr  <dinfuehr@igalia.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -460 +460 @@
                 HandlerInfo& handler = m_rareData->m_exceptionHandlers[i];
 #if ENABLE(JIT)
-                handler.initialize(unlinkedHandler, CodeLocationLabel<ExceptionHandlerPtrTag>(LLInt::getCodePtr<BytecodePtrTag>(op_catch).retagged<ExceptionHandlerPtrTag>()));
+                MacroAssemblerCodePtr<BytecodePtrTag> codePtr = m_instructions->at(unlinkedHandler.target)->isWide()
+                    ? LLInt::getWideCodePtr<BytecodePtrTag>(op_catch)
+                    : LLInt::getCodePtr<BytecodePtrTag>(op_catch);
+                handler.initialize(unlinkedHandler, CodeLocationLabel<ExceptionHandlerPtrTag>(codePtr.retagged<ExceptionHandlerPtrTag>()));
 #else
                 handler.initialize(unlinkedHandler);