Changeset 172932 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Aug 25, 2014, 12:32:40 PM (11 years ago)

Author:

[email protected]

Message:

After r172867 another crash in in js/dom/line-column-numbers.html
​https://bugs.webkit.org/show_bug.cgi?id=136192

Reviewed by Geoffrey Garen.

In lookupExceptionHandlerFromCallerFrame(), We need to use the caller's CallFrame
and VMEntryFrame when calling genericUnwind(). NativeCallFrameTracerWithRestore()
does that for us.

In general, NativeCallFrameTracerWithRestore(), restores the values because we may
do more processing that requires the current callFrame and vmEntryFrame before we
get to the catch handler where we change these to the catch values. In this
particular case, that restoration isn't currently needed, but we add complexity
and possible future confusion if we create another NativeCallFrameTracerXXX()
version that doesn't restore the values.

• jit/JITOperations.cpp:

(JSC::lookupExceptionHandlerFromCallerFrame): Changed NativeCallFrameTracer() to
NativeCallFrameTracerWithRestore() so that VM::topVMEntryFrame will be updated
before calling genericUnwind().

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITOperations.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-08-22  Michael Saboff  <[email protected]>
+
+        After r172867 another crash in in js/dom/line-column-numbers.html
+        https://bugs.webkit.org/show_bug.cgi?id=136192
+
+        Reviewed by Geoffrey Garen.
+
+        In lookupExceptionHandlerFromCallerFrame(), We need to use the caller's CallFrame
+        and VMEntryFrame when calling genericUnwind().  NativeCallFrameTracerWithRestore()
+        does that for us.
+
+        In general, NativeCallFrameTracerWithRestore(), restores the values because we may
+        do more processing that requires the current callFrame and vmEntryFrame before we
+        get to the catch handler where we change these to the catch values.  In this
+        particular case, that restoration isn't currently needed, but we add complexity
+        and possible future confusion if we create another NativeCallFrameTracerXXX()
+        version that doesn't restore the values.
+
+        * jit/JITOperations.cpp:
+        (JSC::lookupExceptionHandlerFromCallerFrame): Changed NativeCallFrameTracer() to
+        NativeCallFrameTracerWithRestore() so that VM::topVMEntryFrame will be updated
+        before calling genericUnwind().
+
 2014-08-24  Brian J. Burg  <[email protected]>
 

trunk/Source/JavaScriptCore/jit/JITOperations.cpp

@@ -1845 +1845 @@
     ASSERT(callerFrame);
 
-    NativeCallFrameTracer tracer(vm, callerFrame);
+    NativeCallFrameTracerWithRestore tracer(vm, vmEntryFrame, callerFrame);
 
     JSValue exceptionValue = vm->exception();