Diff
Modified: trunk/LayoutTests/ChangeLog (178434 => 178435)
--- trunk/LayoutTests/ChangeLog 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/ChangeLog 2015-01-14 20:16:23 UTC (rev 178435)
@@ -1,3 +1,17 @@
+2015-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r178432.
+ https://bugs.webkit.org/show_bug.cgi?id=140460
+
+ Caused 20 JSC Test Failures (Requested by JoePeck on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r174226): Header on huffingtonpost.com is too
+ large"
+ https://bugs.webkit.org/show_bug.cgi?id=140306
+ http://trac.webkit.org/changeset/178432
+
2015-01-14 Michael Saboff <[email protected]>
REGRESSION (r174226): Header on huffingtonpost.com is too large
Modified: trunk/LayoutTests/js/arguments-iterator-expected.txt (178434 => 178435)
--- trunk/LayoutTests/js/arguments-iterator-expected.txt 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/js/arguments-iterator-expected.txt 2015-01-14 20:16:23 UTC (rev 178435)
@@ -36,24 +36,36 @@
PASS actualArgumentsLength is iteratedArgumentsLength
PASS arg === realArg is true
PASS actualArgumentsLength is iteratedArgumentsLength
-PASS testEmptyArrayArguments('a') is true
-PASS testEmptyArrayArguments() is true
PASS arg === realArg is true
PASS arg === realArg is true
PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
PASS actualArgumentsLength is iteratedArgumentsLength
PASS arg === realArg is true
PASS arg === realArg is true
PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
PASS actualArgumentsLength is iteratedArgumentsLength
PASS arg === realArg is true
PASS arg === realArg is true
PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
PASS actualArgumentsLength is iteratedArgumentsLength
PASS arg === realArg is true
PASS arg === realArg is true
PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
+PASS arg === realArg is true
PASS actualArgumentsLength is iteratedArgumentsLength
+PASS testNullArguments() threw exception TypeError: null is not an object (evaluating 'fail("nothing to iterate")').
+PASS testNonArrayLikeArguments() is true
PASS successfullyParsed is true
TEST COMPLETE
Deleted: trunk/LayoutTests/js/regress-140306-expected.txt (178434 => 178435)
--- trunk/LayoutTests/js/regress-140306-expected.txt 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/js/regress-140306-expected.txt 2015-01-14 20:16:23 UTC (rev 178435)
@@ -1,9 +0,0 @@
-Regression test for https://webkit.org/b/140306. This test should run without any exceptions.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/js/regress-140306.html (178434 => 178435)
--- trunk/LayoutTests/js/regress-140306.html 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/js/regress-140306.html 2015-01-14 20:16:23 UTC (rev 178435)
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/js/script-tests/arguments-iterator.js (178434 => 178435)
--- trunk/LayoutTests/js/script-tests/arguments-iterator.js 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/js/script-tests/arguments-iterator.js 2015-01-14 20:16:23 UTC (rev 178435)
@@ -76,33 +76,43 @@
testReifiedArguments({})
-function testEmptyArrayArguments() {
- arguments = [];
+function testOverwrittenArguments() {
+ var i = 0;
+ arguments = "foobar";
for (arg of arguments) {
- fail("nothing to iterate");
- return false;
+ realArg = arguments[i++];
+ shouldBeTrue("arg === realArg");
}
-
- return true;
+ iteratedArgumentsLength = i;
+ actualArgumentsLength = arguments.length;
+ shouldBe("actualArgumentsLength", "iteratedArgumentsLength");
}
-shouldBeTrue("testEmptyArrayArguments('a')");
-shouldBeTrue("testEmptyArrayArguments()");
+testOverwrittenArguments();
+testOverwrittenArguments("a");
+testOverwrittenArguments("a", "b");
+testOverwrittenArguments({})
-function testArrayArguments() {
+
+
+function testNullArguments() {
var i = 0;
- arguments = [1, 2, 3];
+ arguments = null;
for (arg of arguments) {
- realArg = arguments[i++];
- shouldBeTrue("arg === realArg");
+ fail("nothing to iterate");
}
- iteratedArgumentsLength = i;
- actualArgumentsLength = arguments.length;
- shouldBe("actualArgumentsLength", "iteratedArgumentsLength");
}
-testArrayArguments();
-testArrayArguments("a");
-testArrayArguments("a", "b");
-testArrayArguments({});
+shouldThrow("testNullArguments()");
+function testNonArrayLikeArguments() {
+ var i = 0;
+ arguments = {};
+ for (arg of arguments) {
+ fail("nothing to iterate");
+ return false;
+ }
+ return true;
+}
+shouldBeTrue("testNonArrayLikeArguments()");
+
Deleted: trunk/LayoutTests/js/script-tests/regress-140306.js (178434 => 178435)
--- trunk/LayoutTests/js/script-tests/regress-140306.js 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/LayoutTests/js/script-tests/regress-140306.js 2015-01-14 20:16:23 UTC (rev 178435)
@@ -1,34 +0,0 @@
-description(
-"Regression test for https://webkit.org/b/140306. This test should run without any exceptions."
-);
-
-testArgs = [ 1, "Second", new Number(3) ];
-
-function checkArgs(a0, a1, a2) {
- if (a0 !== testArgs[0])
- throw "Value of declared arg a0 is wrong. Should be: " + testArgs[0] + ", was: " + a0;
-
- if (a1 !== testArgs[1])
- throw "Value of declared arg a1 is wrong. Should be: " + testArgs[1] + ", was: " + a1;
-
- if (a2 !== testArgs[2])
- throw "Value of declared arg a2 is wrong. Should be: " + testArgs[2] + ", was: " + a2;
-
- if (arguments.length != 3)
- throw "Length of arguments is wrong. Should be: 3, was: " + arguments.length;
-
- for (var i = 0; i < arguments.length; i++) {
- if (arguments[i] !== testArgs[i])
- throw "Value of arguments[" + i + "] is wrong. Should be: " + testArgs[i] + ", was: " + arguments[i];
- }
-}
-
-function applyToArgs() {
- arguments = testArgs;
-
- checkArgs.apply(this, arguments)
-
- try { } catch (e) { throw e; } // To force the creation of an activation object
-}
-
-applyToArgs(42);
Modified: trunk/Source/_javascript_Core/ChangeLog (178434 => 178435)
--- trunk/Source/_javascript_Core/ChangeLog 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-01-14 20:16:23 UTC (rev 178435)
@@ -1,3 +1,17 @@
+2015-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r178432.
+ https://bugs.webkit.org/show_bug.cgi?id=140460
+
+ Caused 20 JSC Test Failures (Requested by JoePeck on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r174226): Header on huffingtonpost.com is too
+ large"
+ https://bugs.webkit.org/show_bug.cgi?id=140306
+ http://trac.webkit.org/changeset/178432
+
2015-01-14 Brian J. Burg <[email protected]>
Web Inspector: Stopwatch ASSERT when continuing inspector
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (178434 => 178435)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2015-01-14 20:16:23 UTC (rev 178435)
@@ -563,7 +563,7 @@
m_codeBlock->addParameter();
}
-bool BytecodeGenerator::willResolveToArgumentsRegister(const Identifier& ident)
+bool BytecodeGenerator::willResolveToArguments(const Identifier& ident)
{
if (ident != propertyNames().arguments)
return false;
@@ -575,9 +575,6 @@
if (entry.isNull())
return false;
- if (m_localArgumentsRegister && isCaptured(m_localArgumentsRegister->index()))
- return false;
-
if (m_codeBlock->usesArguments() && m_codeType == FunctionCode && m_localArgumentsRegister)
return true;
@@ -586,7 +583,7 @@
RegisterID* BytecodeGenerator::uncheckedLocalArgumentsRegister()
{
- ASSERT(willResolveToArgumentsRegister(propertyNames().arguments));
+ ASSERT(willResolveToArguments(propertyNames().arguments));
ASSERT(m_localArgumentsRegister);
return m_localArgumentsRegister;
}
@@ -1877,7 +1874,7 @@
RELEASE_ASSERT(!n->m_next);
auto _expression_ = static_cast<SpreadExpressionNode*>(n->m_expr)->_expression_();
RefPtr<RegisterID> argumentRegister;
- if (_expression_->isResolveNode() && willResolveToArgumentsRegister(static_cast<ResolveNode*>(_expression_)->identifier()) && !symbolTable().slowArguments())
+ if (_expression_->isResolveNode() && willResolveToArguments(static_cast<ResolveNode*>(_expression_)->identifier()) && !symbolTable().slowArguments())
argumentRegister = uncheckedLocalArgumentsRegister();
else
argumentRegister = _expression_->emitBytecode(*this, callArguments.argumentRegister(0));
@@ -2019,7 +2016,7 @@
RELEASE_ASSERT(!n->m_next);
auto _expression_ = static_cast<SpreadExpressionNode*>(n->m_expr)->_expression_();
RefPtr<RegisterID> argumentRegister;
- if (_expression_->isResolveNode() && willResolveToArgumentsRegister(static_cast<ResolveNode*>(_expression_)->identifier()) && !symbolTable().slowArguments())
+ if (_expression_->isResolveNode() && willResolveToArguments(static_cast<ResolveNode*>(_expression_)->identifier()) && !symbolTable().slowArguments())
argumentRegister = uncheckedLocalArgumentsRegister();
else
argumentRegister = _expression_->emitBytecode(*this, callArguments.argumentRegister(0));
@@ -2597,7 +2594,7 @@
void BytecodeGenerator::emitEnumeration(ThrowableExpressionData* node, ExpressionNode* subjectNode, const std::function<void(BytecodeGenerator&, RegisterID*)>& callBack)
{
if (subjectNode->isResolveNode()
- && willResolveToArgumentsRegister(static_cast<ResolveNode*>(subjectNode)->identifier())
+ && willResolveToArguments(static_cast<ResolveNode*>(subjectNode)->identifier())
&& !symbolTable().slowArguments()) {
RefPtr<RegisterID> index = emitLoad(newTemporary(), jsNumber(0));
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (178434 => 178435)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2015-01-14 20:16:23 UTC (rev 178435)
@@ -277,7 +277,7 @@
void setIsNumericCompareFunction(bool isNumericCompareFunction);
- bool willResolveToArgumentsRegister(const Identifier&);
+ bool willResolveToArguments(const Identifier&);
bool hasSafeLocalArgumentsRegister() { return m_localArgumentsRegister; }
RegisterID* uncheckedLocalArgumentsRegister();
Modified: trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp (178434 => 178435)
--- trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2015-01-14 20:11:44 UTC (rev 178434)
+++ trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2015-01-14 20:16:23 UTC (rev 178435)
@@ -382,7 +382,7 @@
RegisterID* BracketAccessorNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
{
if (m_base->isResolveNode()
- && generator.willResolveToArgumentsRegister(static_cast<ResolveNode*>(m_base)->identifier())
+ && generator.willResolveToArguments(static_cast<ResolveNode*>(m_base)->identifier())
&& !generator.symbolTable().slowArguments()) {
RefPtr<RegisterID> property = generator.emitNode(m_subscript);
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
@@ -418,7 +418,7 @@
if (!m_base->isResolveNode())
goto nonArgumentsPath;
ResolveNode* resolveNode = static_cast<ResolveNode*>(m_base);
- if (!generator.willResolveToArgumentsRegister(resolveNode->identifier()))
+ if (!generator.willResolveToArguments(resolveNode->identifier()))
goto nonArgumentsPath;
generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
return generator.emitGetArgumentsLength(generator.finalDestination(dst), generator.uncheckedLocalArgumentsRegister());
@@ -599,7 +599,7 @@
static RegisterID* getArgumentByVal(BytecodeGenerator& generator, ExpressionNode* base, RegisterID* property, RegisterID* dst, JSTextPosition divot, JSTextPosition divotStart, JSTextPosition divotEnd)
{
if (base->isResolveNode()
- && generator.willResolveToArgumentsRegister(static_cast<ResolveNode*>(base)->identifier())
+ && generator.willResolveToArguments(static_cast<ResolveNode*>(base)->identifier())
&& !generator.symbolTable().slowArguments()) {
generator.emitExpressionInfo(divot, divotStart, divotEnd);
return generator.emitGetArgumentByVal(generator.finalDestination(dst), generator.uncheckedLocalArgumentsRegister(), property);
@@ -757,7 +757,7 @@
RefPtr<RegisterID> thisRegister = generator.emitNode(m_args->m_listNode->m_expr);
RefPtr<RegisterID> argsRegister;
ArgumentListNode* args = m_args->m_listNode->m_next;
- if (args->m_expr->isResolveNode() && generator.willResolveToArgumentsRegister(static_cast<ResolveNode*>(args->m_expr)->identifier()) && !generator.symbolTable().slowArguments())
+ if (args->m_expr->isResolveNode() && generator.willResolveToArguments(static_cast<ResolveNode*>(args->m_expr)->identifier()) && !generator.symbolTable().slowArguments())
argsRegister = generator.uncheckedLocalArgumentsRegister();
else
argsRegister = generator.emitNode(args->m_expr);
@@ -2776,7 +2776,7 @@
RegisterID* ArrayPatternNode::emitDirectBinding(BytecodeGenerator& generator, RegisterID* dst, ExpressionNode* rhs)
{
if (rhs->isResolveNode()
- && generator.willResolveToArgumentsRegister(static_cast<ResolveNode*>(rhs)->identifier())
+ && generator.willResolveToArguments(static_cast<ResolveNode*>(rhs)->identifier())
&& generator.hasSafeLocalArgumentsRegister()&& !generator.symbolTable().slowArguments()) {
for (size_t i = 0; i < m_targetPatterns.size(); i++) {
auto target = m_targetPatterns[i];
