Title: [164836] trunk/Source/_javascript_Core
- Revision
- 164836
- Author
- [email protected]
- Date
- 2014-02-27 15:36:23 -0800 (Thu, 27 Feb 2014)
Log Message
Whoops, include all of last patch.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164835 => 164836)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-27 23:25:29 UTC (rev 164835)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-27 23:36:23 UTC (rev 164836)
@@ -1,5 +1,12 @@
2014-02-27 Oliver Hunt <[email protected]>
+ Whoops, include all of last patch.
+
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileLoadVarargs):
+
+2014-02-27 Oliver Hunt <[email protected]>
+
Slow cases for function.apply and function.call should not require vm re-entry
https://bugs.webkit.org/show_bug.cgi?id=129454
Modified: trunk/Source/_javascript_Core/jit/JITCall32_64.cpp (164835 => 164836)
--- trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2014-02-27 23:25:29 UTC (rev 164835)
+++ trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2014-02-27 23:36:23 UTC (rev 164836)
@@ -143,8 +143,14 @@
slowCase.append(branch32(NotEqual, regT1, TrustedImm32(JSValue::EmptyValueTag)));
load32(payloadFor(JSStack::ArgumentCount), regT2);
- if (firstVarArgOffset)
- sub32(TrustedImm32(firstVarArgOffset), regT2);
+ if (firstVarArgOffset) {
+ Jump sufficientArguments = branch32(GreaterThan, regT0, TrustedImm32(firstVarArgOffset + 1));
+ move(TrustedImm32(1), regT0);
+ Jump endVarArgs = jump();
+ sufficientArguments.link(this);
+ sub32(TrustedImm32(firstVarArgOffset), regT0);
+ endVarArgs.link(this);
+ }
slowCase.append(branch32(Above, regT2, TrustedImm32(Arguments::MaxArguments + 1)));
// regT2: argumentCountIncludingThis
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
