Title: [153646] trunk/Source/_javascript_Core
- Revision
- 153646
- Author
- msab...@apple.com
- Date
- 2013-08-02 07:46:05 -0700 (Fri, 02 Aug 2013)
Log Message
REGRESSION(r153612): It made jsc and layout tests crash
https://bugs.webkit.org/show_bug.cgi?id=119440
Reviewed by Csaba Osztrogonác.
Made the changes if changeset r153612 only apply to 32 bit builds.
* jit/JITExceptions.cpp:
* jit/JITExceptions.h:
* jit/JITStubs.cpp:
(JSC::cti_vm_throw_slowpath):
* jit/JITStubs.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153645 => 153646)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-02 12:19:19 UTC (rev 153645)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-02 14:46:05 UTC (rev 153646)
@@ -1,3 +1,18 @@
+2013-08-02 Michael Saboff <msab...@apple.com>
+
+ REGRESSION(r153612): It made jsc and layout tests crash
+ https://bugs.webkit.org/show_bug.cgi?id=119440
+
+ Reviewed by Csaba Osztrogonác.
+
+ Made the changes if changeset r153612 only apply to 32 bit builds.
+
+ * jit/JITExceptions.cpp:
+ * jit/JITExceptions.h:
+ * jit/JITStubs.cpp:
+ (JSC::cti_vm_throw_slowpath):
+ * jit/JITStubs.h:
+
2013-08-02 Patrick Gansterer <par...@webkit.org>
Add JSCTestRunnerUtils to the list of forwarding headers to fix build.
Modified: trunk/Source/_javascript_Core/jit/JITExceptions.cpp (153645 => 153646)
--- trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2013-08-02 12:19:19 UTC (rev 153645)
+++ trunk/Source/_javascript_Core/jit/JITExceptions.cpp 2013-08-02 14:46:05 UTC (rev 153646)
@@ -51,12 +51,14 @@
return callFrame->locationAsBytecodeOffset();
}
+#if USE(JSVALUE32_64)
EncodedExceptionHandler encode(ExceptionHandler handler)
{
ExceptionHandlerUnion u;
u.handler = handler;
return u.encodedHandler;
}
+#endif
ExceptionHandler genericThrow(VM* vm, ExecState* callFrame, JSValue exceptionValue, unsigned vPCIndex)
{
Modified: trunk/Source/_javascript_Core/jit/JITExceptions.h (153645 => 153646)
--- trunk/Source/_javascript_Core/jit/JITExceptions.h 2013-08-02 12:19:19 UTC (rev 153645)
+++ trunk/Source/_javascript_Core/jit/JITExceptions.h 2013-08-02 14:46:05 UTC (rev 153646)
@@ -44,6 +44,7 @@
void* catchRoutine;
};
+#if USE(JSVALUE32_64)
// EncodedExceptionHandler is used to convince the compiler to return an ExceptionHander
// struct in two registers for 32 bit builds.
typedef int64_t EncodedExceptionHandler;
@@ -54,6 +55,7 @@
};
EncodedExceptionHandler encode(ExceptionHandler);
+#endif
ExceptionHandler genericThrow(VM*, ExecState*, JSValue exceptionValue, unsigned vPCIndex);
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (153645 => 153646)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2013-08-02 12:19:19 UTC (rev 153645)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2013-08-02 14:46:05 UTC (rev 153646)
@@ -2156,12 +2156,21 @@
return handler.callFrame;
}
+#if USE(JSVALUE32_64)
EncodedExceptionHandler JIT_STUB cti_vm_throw_slowpath(CallFrame* callFrame)
{
VM* vm = callFrame->codeBlock()->vm();
vm->topCallFrame = callFrame;
return encode(jitThrowNew(vm, callFrame, vm->exception));
}
+#else
+ExceptionHandler JIT_STUB cti_vm_throw_slowpath(CallFrame* callFrame)
+{
+ VM* vm = callFrame->codeBlock()->vm();
+ vm->topCallFrame = callFrame;
+ return jitThrowNew(vm, callFrame, vm->exception);
+}
+#endif
DEFINE_STUB_FUNCTION(EncodedJSValue, to_object)
{
Modified: trunk/Source/_javascript_Core/jit/JITStubs.h (153645 => 153646)
--- trunk/Source/_javascript_Core/jit/JITStubs.h 2013-08-02 12:19:19 UTC (rev 153645)
+++ trunk/Source/_javascript_Core/jit/JITStubs.h 2013-08-02 14:46:05 UTC (rev 153646)
@@ -416,7 +416,12 @@
EncodedJSValue JIT_STUB cti_op_get_from_scope(STUB_ARGS_DECLARATION) WTF_INTERNAL;
void JIT_STUB cti_op_put_to_scope(STUB_ARGS_DECLARATION) WTF_INTERNAL;
+#if USE(JSVALUE32_64)
EncodedExceptionHandler JIT_STUB cti_vm_throw_slowpath(CallFrame*) REFERENCED_FROM_ASM WTF_INTERNAL;
+#else
+ExceptionHandler JIT_STUB cti_vm_throw_slowpath(CallFrame*) REFERENCED_FROM_ASM WTF_INTERNAL;
+#endif
+
} // extern "C"
#elif ENABLE(LLINT_C_LOOP)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
