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

Timestamp:

Sep 17, 2015, 7:56:29 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r189938, r189952, and r189956.
​https://bugs.webkit.org/show_bug.cgi?id=149329

Broke Web Workers (Requested by ap on #webkit).

Reverted changesets:

"Implement try/catch in the DFG."
​https://bugs.webkit.org/show_bug.cgi?id=147374
​http://trac.webkit.org/changeset/189938

"CLoop build fix after r189938."
​http://trac.webkit.org/changeset/189952

"add a regress test for richards with try/catch."
​https://bugs.webkit.org/show_bug.cgi?id=149301
​http://trac.webkit.org/changeset/189956

File:

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

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -55 +55 @@
     Instruction* catchPCForInterpreter = 0;
     if (handler) {
-        // handler->target is meaningless for getting a code offset when catching
-        // the exception in a DFG frame. This bytecode target offset could be
-        // something that's in an inlined frame, which means an array access
-        // with this bytecode offset in the machine frame is utterly meaningless
-        // and can cause an overflow. OSR exit properly exits to handler->target
-        // in the proper frame.
-        if (callFrame->codeBlock()->jitType() != JITCode::DFGJIT)
-            catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target];
+        catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target];
 #if ENABLE(JIT)
         catchRoutine = handler->nativeCode.executableAddress();