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

Timestamp:

Oct 26, 2018, 4:34:01 PM (7 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r237479 and r237484.
​https://bugs.webkit.org/show_bug.cgi?id=190978

broke JSC on iOS (Requested by tadeuzagallo on #webkit).

Reverted changesets:

"New bytecode format for JSC"
​https://bugs.webkit.org/show_bug.cgi?id=187373
​https://trac.webkit.org/changeset/237479

"Gardening: Build fix after r237479."
​https://bugs.webkit.org/show_bug.cgi?id=187373
​https://trac.webkit.org/changeset/237484

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -61 +61 @@
 
     void* catchRoutine;
-    const Instruction* catchPCForInterpreter = nullptr;
+    Instruction* catchPCForInterpreter = 0;
     if (handler) {
         // handler->target is meaningless for getting a code offset when catching
@@ -70 +70 @@
         // in the proper frame.
         if (!JITCode::isOptimizingJIT(callFrame->codeBlock()->jitType()))
-            catchPCForInterpreter = callFrame->codeBlock()->instructions().at(handler->target).ptr();
+            catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target];
 #if ENABLE(JIT)
         catchRoutine = handler->nativeCode.executableAddress();
 #else
-        catchRoutine = LLInt::getCodePtr(catchPCForInterpreter->opcodeID());
+        catchRoutine = catchPCForInterpreter->u.pointer;
 #endif
     } else