Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (172404 => 172405)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-11 19:50:52 UTC (rev 172404)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-11 20:00:58 UTC (rev 172405)
@@ -1,3 +1,19 @@
+2014-08-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r172401.
+ https://bugs.webkit.org/show_bug.cgi?id=135812
+
+ Failing stress/for-in-tests.js
+ http://build.webkit.org/builders/Apple%20Mavericks%20Release%20WK1%20%28Tests%29/builds/7945/steps
+ /jscore-test/logs/stdio (Requested by mlam on #webkit).
+
+ Reverted changeset:
+
+ "for-in optimization should also make sure the base matches
+ the object being iterated"
+ https://bugs.webkit.org/show_bug.cgi?id=135782
+ http://trac.webkit.org/changeset/172401
+
2014-08-11 Brian J. Burg <[email protected]>
Web Inspector: use type builders to construct high fidelity type information payloads
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (172404 => 172405)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2014-08-11 19:50:52 UTC (rev 172404)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2014-08-11 20:00:58 UTC (rev 172405)
@@ -1445,9 +1445,6 @@
{
for (size_t i = m_forInContextStack.size(); i > 0; i--) {
ForInContext* context = m_forInContextStack[i - 1].get();
- if (context->base() != base)
- continue;
-
if (context->local() != property)
continue;
@@ -2623,11 +2620,11 @@
return dst;
}
-void BytecodeGenerator::pushIndexedForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
+void BytecodeGenerator::pushIndexedForInScope(RegisterID* localRegister, RegisterID* indexRegister)
{
if (!localRegister)
return;
- m_forInContextStack.append(std::make_unique<IndexedForInContext>(baseRegister, localRegister, indexRegister));
+ m_forInContextStack.append(std::make_unique<IndexedForInContext>(localRegister, indexRegister));
}
void BytecodeGenerator::popIndexedForInScope(RegisterID* localRegister)
@@ -2637,11 +2634,11 @@
m_forInContextStack.removeLast();
}
-void BytecodeGenerator::pushStructureForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
+void BytecodeGenerator::pushStructureForInScope(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
{
if (!localRegister)
return;
- m_forInContextStack.append(std::make_unique<StructureForInContext>(baseRegister, localRegister, indexRegister, propertyRegister, enumeratorRegister));
+ m_forInContextStack.append(std::make_unique<StructureForInContext>(localRegister, indexRegister, propertyRegister, enumeratorRegister));
}
void BytecodeGenerator::popStructureForInScope(RegisterID* localRegister)
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (172404 => 172405)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2014-08-11 19:50:52 UTC (rev 172404)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2014-08-11 20:00:58 UTC (rev 172405)
@@ -99,9 +99,8 @@
class ForInContext {
public:
- ForInContext(RegisterID* baseRegister, RegisterID* localRegister)
- : m_baseRegister(baseRegister)
- , m_localRegister(localRegister)
+ ForInContext(RegisterID* localRegister)
+ : m_localRegister(localRegister)
, m_isValid(true)
{
}
@@ -119,19 +118,17 @@
};
virtual ForInContextType type() const = 0;
- RegisterID* base() const { return m_baseRegister.get(); }
RegisterID* local() const { return m_localRegister.get(); }
private:
- RefPtr<RegisterID> m_baseRegister;
RefPtr<RegisterID> m_localRegister;
bool m_isValid;
};
class StructureForInContext : public ForInContext {
public:
- StructureForInContext(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
- : ForInContext(baseRegister, localRegister)
+ StructureForInContext(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
+ : ForInContext(localRegister)
, m_indexRegister(indexRegister)
, m_propertyRegister(propertyRegister)
, m_enumeratorRegister(enumeratorRegister)
@@ -155,8 +152,8 @@
class IndexedForInContext : public ForInContext {
public:
- IndexedForInContext(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
- : ForInContext(baseRegister, localRegister)
+ IndexedForInContext(RegisterID* localRegister, RegisterID* indexRegister)
+ : ForInContext(localRegister)
, m_indexRegister(indexRegister)
{
}
@@ -528,9 +525,9 @@
void pushFinallyContext(StatementNode* finallyBlock);
void popFinallyContext();
- void pushIndexedForInScope(RegisterID* base, RegisterID* local, RegisterID* index);
+ void pushIndexedForInScope(RegisterID* local, RegisterID* index);
void popIndexedForInScope(RegisterID* local);
- void pushStructureForInScope(RegisterID* base, RegisterID* local, RegisterID* index, RegisterID* property, RegisterID* enumerator);
+ void pushStructureForInScope(RegisterID* local, RegisterID* index, RegisterID* property, RegisterID* enumerator);
void popStructureForInScope(RegisterID* local);
void invalidateForInContextForLocal(RegisterID* local);
Modified: trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp (172404 => 172405)
--- trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2014-08-11 19:50:52 UTC (rev 172404)
+++ trunk/Source/_javascript_Core/bytecompiler/NodesCodegen.cpp 2014-08-11 20:00:58 UTC (rev 172405)
@@ -2044,7 +2044,7 @@
generator.emitToIndexString(propertyName.get(), i.get());
this->emitLoopHeader(generator, propertyName.get());
- generator.pushIndexedForInScope(base.get(), local.get(), i.get());
+ generator.pushIndexedForInScope(local.get(), i.get());
generator.emitNode(dst, m_statement);
generator.popIndexedForInScope(local.get());
@@ -2078,7 +2078,7 @@
this->emitLoopHeader(generator, propertyName.get());
- generator.pushStructureForInScope(base.get(), local.get(), i.get(), propertyName.get(), structureEnumerator.get());
+ generator.pushStructureForInScope(local.get(), i.get(), propertyName.get(), structureEnumerator.get());
generator.emitNode(dst, m_statement);
generator.popStructureForInScope(local.get());
Modified: trunk/Source/_javascript_Core/tests/stress/for-in-tests.js (172404 => 172405)
--- trunk/Source/_javascript_Core/tests/stress/for-in-tests.js 2014-08-11 19:50:52 UTC (rev 172404)
+++ trunk/Source/_javascript_Core/tests/stress/for-in-tests.js 2014-08-11 20:00:58 UTC (rev 172405)
@@ -75,26 +75,3 @@
}
foo(null);
})();
-(function() {
- var foo = function(a, b) {
- for (var p in a) {
- var f1 = a[p];
- var f2 = b[p];
- if (f1 === f2)
- continue;
- a[p] = b[p];
- }
- };
- noInline(foo);
- for (var i = 0; i < 10000; ++i) {
- var o1 = {};
- var o2 = {};
- o2.x = 42;
- o2.y = 53;
- foo(o1, o2);
- if (o1.x !== o2.x)
- throw new Error("bad result: " + o1.x + "!==" + o2.x);
- if (o1.y !== o2.y)
- throw new Error("bad result: " + o1.y + "!==" + o2.y);
- }
-})();
