Title: [127394] trunk/Source/_javascript_Core
- Revision
- 127394
- Author
- [email protected]
- Date
- 2012-09-02 16:45:19 -0700 (Sun, 02 Sep 2012)
Log Message
Fixed failures seen on Linux bots.
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_push_with_scope):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_push_with_scope):
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* jit/JITStubs.h: push_*_scope doesn't have a destination operand anymore.
Accordingly, update these places in the baseline JIT, which I missed in my last patch.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (127393 => 127394)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-02 21:27:23 UTC (rev 127393)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-02 23:45:19 UTC (rev 127394)
@@ -1,5 +1,18 @@
2012-09-02 Geoffrey Garen <[email protected]>
+ Fixed failures seen on Linux bots.
+
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_push_with_scope):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_push_with_scope):
+ * jit/JITStubs.cpp:
+ (JSC::DEFINE_STUB_FUNCTION):
+ * jit/JITStubs.h: push_*_scope doesn't have a destination operand anymore.
+ Accordingly, update these places in the baseline JIT, which I missed in my last patch.
+
+2012-09-02 Geoffrey Garen <[email protected]>
+
Refactored scope chain opcodes to support optimization for named function expressions
https://bugs.webkit.org/show_bug.cgi?id=95658
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (127393 => 127394)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-09-02 21:27:23 UTC (rev 127393)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-09-02 23:45:19 UTC (rev 127394)
@@ -1007,7 +1007,7 @@
{
JITStubCall stubCall(this, cti_op_push_with_scope);
stubCall.addArgument(currentInstruction[1].u.operand, regT2);
- stubCall.call(currentInstruction[1].u.operand);
+ stubCall.call();
}
void JIT::emit_op_pop_scope(Instruction*)
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (127393 => 127394)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-09-02 21:27:23 UTC (rev 127393)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-09-02 23:45:19 UTC (rev 127394)
@@ -1362,7 +1362,7 @@
{
JITStubCall stubCall(this, cti_op_push_with_scope);
stubCall.addArgument(currentInstruction[1].u.operand);
- stubCall.call(currentInstruction[1].u.operand);
+ stubCall.call();
}
void JIT::emit_op_pop_scope(Instruction*)
Modified: trunk/Source/_javascript_Core/jit/JITStubs.cpp (127393 => 127394)
--- trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-09-02 21:27:23 UTC (rev 127393)
+++ trunk/Source/_javascript_Core/jit/JITStubs.cpp 2012-09-02 23:45:19 UTC (rev 127394)
@@ -3141,14 +3141,13 @@
return result;
}
-DEFINE_STUB_FUNCTION(JSObject*, op_push_with_scope)
+DEFINE_STUB_FUNCTION(void, op_push_with_scope)
{
STUB_INIT_STACK_FRAME(stackFrame);
JSObject* o = stackFrame.args[0].jsValue().toObject(stackFrame.callFrame);
- CHECK_FOR_EXCEPTION();
+ CHECK_FOR_EXCEPTION_VOID();
stackFrame.callFrame->setScope(JSWithScope::create(stackFrame.callFrame, o));
- return o;
}
DEFINE_STUB_FUNCTION(void, op_pop_scope)
Modified: trunk/Source/_javascript_Core/jit/JITStubs.h (127393 => 127394)
--- trunk/Source/_javascript_Core/jit/JITStubs.h 2012-09-02 21:27:23 UTC (rev 127393)
+++ trunk/Source/_javascript_Core/jit/JITStubs.h 2012-09-02 23:45:19 UTC (rev 127394)
@@ -418,7 +418,7 @@
JSObject* JIT_STUB cti_op_new_regexp(STUB_ARGS_DECLARATION) WTF_INTERNAL;
JSObject* JIT_STUB cti_op_push_activation(STUB_ARGS_DECLARATION) WTF_INTERNAL;
void JIT_STUB cti_op_push_name_scope(STUB_ARGS_DECLARATION) WTF_INTERNAL;
- JSObject* JIT_STUB cti_op_push_with_scope(STUB_ARGS_DECLARATION) WTF_INTERNAL;
+ void JIT_STUB cti_op_push_with_scope(STUB_ARGS_DECLARATION) WTF_INTERNAL;
JSObject* JIT_STUB cti_op_put_by_id_transition_realloc(STUB_ARGS_DECLARATION) WTF_INTERNAL;
JSPropertyNameIterator* JIT_STUB cti_op_get_pnames(STUB_ARGS_DECLARATION) WTF_INTERNAL;
int JIT_STUB cti_op_eq(STUB_ARGS_DECLARATION) WTF_INTERNAL;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
