Title: [128122] trunk/Source/_javascript_Core
- Revision
- 128122
- Author
- [email protected]
- Date
- 2012-09-10 16:13:47 -0700 (Mon, 10 Sep 2012)
Log Message
Try to fix the Windows (32-bit) build.
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_tear_off_arguments):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_tear_off_arguments): Get operands 1 and 2, not 1 and 1. :(
Also took this opportunity to rename to indicate that these values are
not destinations anymore.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (128121 => 128122)
--- trunk/Source/_javascript_Core/ChangeLog 2012-09-10 23:01:58 UTC (rev 128121)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-09-10 23:13:47 UTC (rev 128122)
@@ -1,5 +1,17 @@
2012-09-10 Geoffrey Garen <[email protected]>
+ Try to fix the Windows (32-bit) build.
+
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_tear_off_arguments):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_tear_off_arguments): Get operands 1 and 2, not 1 and 1. :(
+
+ Also took this opportunity to rename to indicate that these values are
+ not destinations anymore.
+
+2012-09-10 Geoffrey Garen <[email protected]>
+
DFG misses arguments tear-off for function.arguments if 'arguments' is used
https://bugs.webkit.org/show_bug.cgi?id=96227
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (128121 => 128122)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-09-10 23:01:58 UTC (rev 128121)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-09-10 23:13:47 UTC (rev 128122)
@@ -569,12 +569,12 @@
void JIT::emit_op_tear_off_arguments(Instruction* currentInstruction)
{
- int dst = currentInstruction[1].u.operand;
+ int arguments = currentInstruction[1].u.operand;
int activation = currentInstruction[2].u.operand;
- Jump argsNotCreated = branchTestPtr(Zero, Address(callFrameRegister, sizeof(Register) * (unmodifiedArgumentsRegister(dst))));
+ Jump argsNotCreated = branchTestPtr(Zero, Address(callFrameRegister, sizeof(Register) * (unmodifiedArgumentsRegister(arguments))));
JITStubCall stubCall(this, cti_op_tear_off_arguments);
- stubCall.addArgument(unmodifiedArgumentsRegister(dst), regT2);
+ stubCall.addArgument(unmodifiedArgumentsRegister(arguments), regT2);
stubCall.addArgument(activation, regT2);
stubCall.call();
argsNotCreated.link(this);
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (128121 => 128122)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-09-10 23:01:58 UTC (rev 128121)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2012-09-10 23:13:47 UTC (rev 128122)
@@ -712,12 +712,12 @@
void JIT::emit_op_tear_off_arguments(Instruction* currentInstruction)
{
- int dst = currentInstruction[1].u.operand;
- int activation = currentInstruction[1].u.operand;
+ int arguments = currentInstruction[1].u.operand;
+ int activation = currentInstruction[2].u.operand;
- Jump argsNotCreated = branch32(Equal, tagFor(unmodifiedArgumentsRegister(dst)), TrustedImm32(JSValue::EmptyValueTag));
+ Jump argsNotCreated = branch32(Equal, tagFor(unmodifiedArgumentsRegister(arguments)), TrustedImm32(JSValue::EmptyValueTag));
JITStubCall stubCall(this, cti_op_tear_off_arguments);
- stubCall.addArgument(unmodifiedArgumentsRegister(dst));
+ stubCall.addArgument(unmodifiedArgumentsRegister(arguments));
stubCall.addArgument(activation);
stubCall.call();
argsNotCreated.link(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
