Changeset 33562

Timestamp:

05/17/08 21:53:26 (6 months ago)

Author:

cwzwarich@webkit.org

Message:

2008-05-17 Cameron Zwarich <cwzwarich@uwaterloo.ca>

Reviewed by Oliver.

Bug 18991: SquirrelFish: Major codegen issue in a.b=expr, a[b]=expr
<https://bugs.webkit.org/show_bug.cgi?id=18991>

Fix the last remaining blocking cases of this bug.

JavaScriptCore:

• kjs/grammar.y:
• kjs/nodes.cpp: (KJS::ReadModifyResolveNode::emitCode):

LayoutTests:

• fast/js/codegen-temporaries-expected.txt:
• fast/js/resources/codegen-temporaries.js:

Location:

branches/squirrelfish

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/kjs/grammar.y (modified) (1 diff)
• JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/codegen-temporaries-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/resources/codegen-temporaries.js (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Oliver.
+
+        Bug 18991: SquirrelFish: Major codegen issue in a.b=expr, a[b]=expr
+        <https://bugs.webkit.org/show_bug.cgi?id=18991>
+
+        Fix the last remaining blocking cases of this bug.
+
+        * kjs/grammar.y:
+        * kjs/nodes.cpp:
+        (KJS::ReadModifyResolveNode::emitCode):
+
 2008-05-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

branches/squirrelfish/JavaScriptCore/kjs/grammar.y

@@ -424 +424 @@
 PostfixExpr:
     LeftHandSideExpr
-  | LeftHandSideExpr PLUSPLUS           { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpPlusPlus), $1.m_featureInfo); }
-  | LeftHandSideExpr MINUSMINUS         { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpMinusMinus), $1.m_featureInfo); }
+  | LeftHandSideExpr PLUSPLUS           { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpPlusPlus), $1.m_featureInfo | AssignFeature); }
+  | LeftHandSideExpr MINUSMINUS         { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpMinusMinus), $1.m_featureInfo | AssignFeature); }
 ;
 
 PostfixExprNoBF:
     LeftHandSideExprNoBF
-  | LeftHandSideExprNoBF PLUSPLUS       { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpPlusPlus), $1.m_featureInfo); }
-  | LeftHandSideExprNoBF MINUSMINUS     { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpMinusMinus), $1.m_featureInfo); }
+  | LeftHandSideExprNoBF PLUSPLUS       { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpPlusPlus), $1.m_featureInfo | AssignFeature); }
+  | LeftHandSideExprNoBF MINUSMINUS     { $$ = createNodeFeatureInfo<ExpressionNode*>(makePostfixNode($1.m_node, OpMinusMinus), $1.m_featureInfo | AssignFeature); }
 ;
 

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -4158 +4158 @@
         }
         
+        if (generator.leftHandSideNeedsCopy(m_rightHasAssignments) && !m_right.get()->isNumber()) {
+            RefPtr<RegisterID> result = generator.newTemporary();
+            generator.emitMove(result.get(), local);
+            RegisterID* src2 = generator.emitNode(m_right.get());
+            emitReadModifyAssignment(generator, result.get(), result.get(), src2, m_operator);
+            generator.emitMove(local, result.get());
+            return generator.moveToDestinationIfNeeded(dst, result.get());
+        }
+        
         RegisterID* src2 = generator.emitNode(m_right.get());
         RegisterID* result = emitReadModifyAssignment(generator, local, local, src2, m_operator);

branches/squirrelfish/LayoutTests/ChangeLog

@@ +1 @@
+2008-05-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Oliver.
+
+        Add more tests for:
+
+        Bug 18991: SquirrelFish: Major codegen issue in a.b=expr, a[b]=expr
+        <https://bugs.webkit.org/show_bug.cgi?id=18991>
+
+        * fast/js/codegen-temporaries-expected.txt:
+        * fast/js/resources/codegen-temporaries.js:
+
 2008-05-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

branches/squirrelfish/LayoutTests/fast/js/codegen-temporaries-expected.txt

@@ -22 +22 @@
 PASS assign_test15() is 'PASS'
 PASS assign_test16() is 2
+PASS a17 is 3
+PASS assign_test18() is 3
+PASS a19.b is 3
+PASS assign_test20() is 3
+PASS a21['b'] is 3
+PASS assign_test22() is 3
+PASS assign_test23() is 3
+PASS assign_test24() is 3
+PASS assign_test25() is 3
+PASS assign_test26() is 3
+PASS assign_test27() is 3
+PASS assign_test28() is 3
+PASS assign_test29() is 3
+PASS assign_test30() is 'fooNaN'
 PASS successfullyParsed is true
 

branches/squirrelfish/LayoutTests/fast/js/resources/codegen-temporaries.js

@@ -166 +166 @@
 shouldBe("assign_test16()", "2");
 
+var a17 = 1;
+a17 += (a17 += 1);
+
+shouldBe("a17", "3");
+
+function assign_test18()
+{
+    var a = 1;
+    a += (a += 1);
+    return a;
+}
+
+shouldBe("assign_test18()", "3");
+
+var a19 = { b: 1 };
+a19.b += (a19.b += 1);
+
+shouldBe("a19.b", "3");
+
+function assign_test20()
+{
+    var a = { b: 1 };
+    a.b += (a.b += 1);
+    return a.b;
+}
+
+shouldBe("assign_test20()", "3");
+
+var a21 = { b: 1 };
+a21["b"] += (a21["b"] += 1);
+
+shouldBe("a21['b']", "3");
+
+function assign_test22()
+{
+    var a = { b: 1 };
+    a["b"] += (a["b"] += 1);
+    return a["b"];
+}
+
+shouldBe("assign_test22()", "3");
+
+function assign_test23()
+{
+    var o = { b: 1 };
+    var a = o;
+    a.b += a = 2;
+    return o.b;
+}
+
+shouldBe("assign_test23()", "3");
+
+function assign_test24()
+{
+    var o = { b: 1 };
+    var a = o;
+    a["b"] += a = 2;
+    return o["b"];
+}
+
+shouldBe("assign_test24()", "3");
+
+function assign_test25()
+{
+    var o = { b: 1 };
+    var a = o;
+    a[a = "b"] += a = 2;
+    return o["b"];
+}
+
+shouldBe("assign_test25()", "3");
+
+function assign_test26()
+{
+    var o = { b: 1 };
+    var a = o;
+    var b = "b";
+    a[b] += a = 2;
+    return o["b"];
+}
+
+shouldBe("assign_test26()", "3");
+
+function assign_test27()
+{
+    var o = { b: 1 };
+    var a = o;
+    a.b += (a = 100, 2);
+    return o.b;
+}
+
+shouldBe("assign_test27()", "3");
+
+function assign_test28()
+{
+    var o = { b: 1 };
+    var a = o;
+    a["b"] += (a = 100, 2);
+    return o["b"];
+}
+
+shouldBe("assign_test28()", "3");
+
+function assign_test29()
+{
+    var o = { b: 1 };
+    var a = o;
+    var b = "b";
+    a[b] += (a = 100, 2);
+    return o["b"];
+}
+
+shouldBe("assign_test29()", "3");
+
+function assign_test30()
+{
+    var a = "foo";
+    a += (a++);
+    return a;
+}
+
+shouldBe("assign_test30()", "'fooNaN'");
+
 successfullyParsed = true;