Diff
Modified: tags/Safari-602.1.8/LayoutTests/ChangeLog (191410 => 191411)
--- tags/Safari-602.1.8/LayoutTests/ChangeLog 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/LayoutTests/ChangeLog 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,7 @@
+2015-10-21 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r191360.
+
2015-10-20 Ryan Haddad <ryanhad...@apple.com>
Marking http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-twice.html as flaky on Yosemite
Modified: tags/Safari-602.1.8/LayoutTests/js/caller-property-expected.txt (191410 => 191411)
--- tags/Safari-602.1.8/LayoutTests/js/caller-property-expected.txt 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/LayoutTests/js/caller-property-expected.txt 2015-10-21 23:10:45 UTC (rev 191411)
@@ -10,13 +10,13 @@
PASS nonStrictCaller(strictCallee) threw exception TypeError: Type error.
PASS strictCaller(nonStrictCallee) threw exception TypeError: Function.caller used to retrieve strict caller.
PASS strictCaller(strictCallee) threw exception TypeError: Type error.
-PASS strictTailCaller(nonStrictCallee) is null
+FAIL strictTailCaller(nonStrictCallee) should be null. Threw exception TypeError: Function.caller used to retrieve strict caller
PASS strictTailCaller(strictCallee) threw exception TypeError: Type error.
PASS nonStrictCaller(boundNonStrictCallee) is nonStrictCaller
PASS nonStrictCaller(boundStrictCallee) threw exception TypeError: Type error.
PASS strictCaller(boundNonStrictCallee) threw exception TypeError: Function.caller used to retrieve strict caller.
PASS strictCaller(boundStrictCallee) threw exception TypeError: Type error.
-PASS strictTailCaller(boundNonStrictCallee) is null
+FAIL strictTailCaller(boundNonStrictCallee) should be null. Threw exception TypeError: Function.caller used to retrieve strict caller
PASS strictTailCaller(boundStrictCallee) threw exception TypeError: Type error.
PASS nonStrictGetter(nonStrictAccessor) is nonStrictGetter
PASS nonStrictSetter(nonStrictAccessor) is true
Deleted: tags/Safari-602.1.8/LayoutTests/js/regress-150336-expected.txt (191410 => 191411)
--- tags/Safari-602.1.8/LayoutTests/js/regress-150336-expected.txt 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/LayoutTests/js/regress-150336-expected.txt 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,10 +0,0 @@
-Regression test for https://webkit.org/b/150336.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Properly handled OSR exit from a bound function with an inlined tail callee.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: tags/Safari-602.1.8/LayoutTests/js/regress-150336.html (191410 => 191411)
--- tags/Safari-602.1.8/LayoutTests/js/regress-150336.html 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/LayoutTests/js/regress-150336.html 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: tags/Safari-602.1.8/LayoutTests/js/script-tests/regress-150336.js (191410 => 191411)
--- tags/Safari-602.1.8/LayoutTests/js/script-tests/regress-150336.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/LayoutTests/js/script-tests/regress-150336.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,45 +0,0 @@
-description("Regression test for https://webkit.org/b/150336.");
-
-// This test verifies that an OSR exit from a bound function with an inlined tail callee
-// properly transitions to the baseline JIT without crashing.
-
-myObj = {
- val: 1
-}
-
-function bar(a, idx)
-{
- "use strict";
-
- if (idx == 9900)
- myObj.dfgOSR = "Test";
-
- if (idx == 199900)
- myObj.ftlOSR = "Test";
-
- return myObj.val + a;
-}
-
-function foo(a, idx)
-{
- "use strict";
-
- return bar(a, idx);
-}
-
-boundFoo = foo.bind(null, 41);
-
-function test()
-{
- for (var i = 0; i < 200000; i++) {
- got = boundFoo(i);
- if (got != 42)
- testFailed("Function returned " + got + " but expected 42!");
- }
-}
-
-noInline(test);
-
-test();
-
-testPassed("Properly handled OSR exit from a bound function with an inlined tail callee.");
Modified: tags/Safari-602.1.8/Source/_javascript_Core/ChangeLog (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/ChangeLog 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/ChangeLog 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,7 @@
+2015-10-21 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r191360.
+
2015-10-20 Mark Lam <mark....@apple.com>
YarrPatternConstructor::containsCapturingTerms() should not assume that its terms.size() is greater than 0.
Modified: tags/Safari-602.1.8/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2015-10-21 23:10:45 UTC (rev 191411)
@@ -214,16 +214,7 @@
jit.storePtr(AssemblyHelpers::TrustedImmPtr(trueReturnPC), AssemblyHelpers::addressFor(inlineCallFrame->stackOffset + virtualRegisterForArgument(inlineCallFrame->arguments.size()).offset()));
jit.storePtr(AssemblyHelpers::TrustedImmPtr(baselineCodeBlock), AssemblyHelpers::addressFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::CodeBlock)));
-
- // Restore the inline call frame's callee save registers.
- // If this inlined frame is a tail call that will return back to the original caller, we need to
- // copy the prior contents of the tag registers already saved for the outer frame to this frame.
- jit.emitSaveOrCopyCalleeSavesFor(
- baselineCodeBlock,
- static_cast<VirtualRegister>(inlineCallFrame->stackOffset),
- trueCaller ? AssemblyHelpers::UseExistingTagRegisterContents : AssemblyHelpers::CopySavedTagRegistersFromBaseFrame,
- GPRInfo::regT2);
-
+ jit.emitSaveCalleeSavesFor(baselineCodeBlock, static_cast<VirtualRegister>(inlineCallFrame->stackOffset));
if (!inlineCallFrame->isVarargs())
jit.store32(AssemblyHelpers::TrustedImm32(inlineCallFrame->arguments.size()), AssemblyHelpers::payloadFor((VirtualRegister)(inlineCallFrame->stackOffset + JSStack::ArgumentCount)));
#if USE(JSVALUE64)
Modified: tags/Safari-602.1.8/Source/_javascript_Core/jit/AssemblyHelpers.h (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/jit/AssemblyHelpers.h 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/jit/AssemblyHelpers.h 2015-10-21 23:10:45 UTC (rev 191411)
@@ -178,7 +178,7 @@
#endif
}
- void emitSaveCalleeSavesFor(CodeBlock* codeBlock)
+ void emitSaveCalleeSavesFor(CodeBlock* codeBlock, VirtualRegister offsetVirtualRegister = static_cast<VirtualRegister>(0))
{
ASSERT(codeBlock);
@@ -190,43 +190,10 @@
RegisterAtOffset entry = calleeSaves->at(i);
if (dontSaveRegisters.get(entry.reg()))
continue;
- storePtr(entry.reg().gpr(), Address(framePointerRegister, entry.offset()));
+ storePtr(entry.reg().gpr(), Address(framePointerRegister, offsetVirtualRegister.offsetInBytes() + entry.offset()));
}
}
-
- enum RestoreTagRegisterMode { UseExistingTagRegisterContents, CopySavedTagRegistersFromBaseFrame };
- void emitSaveOrCopyCalleeSavesFor(CodeBlock* codeBlock, VirtualRegister offsetVirtualRegister, RestoreTagRegisterMode tagRegisterMode, GPRReg temp)
- {
- ASSERT(codeBlock);
-
- RegisterAtOffsetList* calleeSaves = codeBlock->calleeSaveRegisters();
- RegisterSet dontSaveRegisters = RegisterSet(RegisterSet::stackRegisters(), RegisterSet::allFPRs());
- unsigned registerCount = calleeSaves->size();
-
- for (unsigned i = 0; i < registerCount; i++) {
- RegisterAtOffset entry = calleeSaves->at(i);
- if (dontSaveRegisters.get(entry.reg()))
- continue;
-
- GPRReg registerToWrite;
-
-#if USE(JSVALUE32_64)
- UNUSED_PARAM(tagRegisterMode);
- UNUSED_PARAM(temp);
-#else
- if (tagRegisterMode == CopySavedTagRegistersFromBaseFrame
- && (entry.reg() == GPRInfo::tagTypeNumberRegister || entry.reg() == GPRInfo::tagMaskRegister)) {
- registerToWrite = temp;
- loadPtr(AssemblyHelpers::Address(GPRInfo::callFrameRegister, entry.offset()), registerToWrite);
- } else
-#endif
- registerToWrite = entry.reg().gpr();
-
- storePtr(registerToWrite, Address(framePointerRegister, offsetVirtualRegister.offsetInBytes() + entry.offset()));
- }
- }
-
void emitRestoreCalleeSavesFor(CodeBlock* codeBlock)
{
ASSERT(codeBlock);
Modified: tags/Safari-602.1.8/Source/_javascript_Core/runtime/Options.h (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/runtime/Options.h 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/runtime/Options.h 2015-10-21 23:10:45 UTC (rev 191411)
@@ -131,7 +131,7 @@
v(bool, forceProfilerBytecodeGeneration, false, nullptr) \
\
v(bool, useFunctionDotArguments, true, nullptr) \
- v(bool, useTailCalls, true, nullptr) \
+ v(bool, useTailCalls, false, nullptr) \
\
/* dumpDisassembly implies dumpDFGDisassembly. */ \
v(bool, dumpDisassembly, false, "dumps disassembly of all JIT compiled code upon compilation") \
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/es6.yaml (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/es6.yaml 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/es6.yaml 2015-10-21 23:10:45 UTC (rev 191411)
@@ -879,9 +879,9 @@
- path: es6/Promise_Promise[Symbol.species].js
cmd: runES6 :fail
- path: es6/proper_tail_calls_tail_call_optimisation_direct_recursion.js
- cmd: runES6 :normal
+ cmd: runES6 :fail
- path: es6/proper_tail_calls_tail_call_optimisation_mutual_recursion.js
- cmd: runES6 :normal
+ cmd: runES6 :fail
- path: es6/prototype_of_bound_functions_arrow_functions.js
cmd: runES6 :fail
- path: es6/prototype_of_bound_functions_basic_functions.js
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/dfg-tail-calls.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/dfg-tail-calls.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/dfg-tail-calls.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
(function nonInlinedTailCall() {
function callee() { if (callee.caller != nonInlinedTailCall) throw new Error(); }
noInline(callee);
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/mutual-tail-call-no-stack-overflow.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/mutual-tail-call-no-stack-overflow.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/mutual-tail-call-no-stack-overflow.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
function shouldThrow(func, errorMessage) {
var errorThrown = false;
var error = null;
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-in-inline-cache.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-in-inline-cache.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-in-inline-cache.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
"use strict";
function tail() { }
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-no-stack-overflow.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-no-stack-overflow.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-no-stack-overflow.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
function shouldThrow(func, errorMessage) {
var errorThrown = false;
var error = null;
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-recognize.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-recognize.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-recognize.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
function callerMustBeRun() {
if (!Object.is(callerMustBeRun.caller, runTests))
throw Error("Wrong caller, expected run but got ", callerMustBeRun.caller);
Modified: tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-varargs-no-stack-overflow.js (191410 => 191411)
--- tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-varargs-no-stack-overflow.js 2015-10-21 23:05:53 UTC (rev 191410)
+++ tags/Safari-602.1.8/Source/_javascript_Core/tests/stress/tail-call-varargs-no-stack-overflow.js 2015-10-21 23:10:45 UTC (rev 191411)
@@ -1,3 +1,4 @@
+//@ skip
function shouldThrow(func, errorMessage) {
var errorThrown = false;
var error = null;
