Changeset 32520 in webkit

Timestamp:

Apr 24, 2008 3:58:23 PM (16 years ago)

Author:

oliver@apple.com

Message:

Cameron Zwarich <​cwzwarich@uwaterloo.ca>

Reviewed by Oliver.

Bug 18717: SQUIRRELFISH: eval returns the wrong value for a variable declaration statement
<​https://bugs.webkit.org/show_bug.cgi?id=18717>

Fixes a regression test, but exposes the failure of another due to the
lack of getters and setters.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (3 diffs)
• kjs/nodes.h (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-04-24  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Oliver.
+
+        Bug 18717: SQUIRRELFISH: eval returns the wrong value for a variable declaration statement
+        <https://bugs.webkit.org/show_bug.cgi?id=18717>
+
+        Fixes a regression test, but exposes the failure of another due to the
+        lack of getters and setters.
+
+        * kjs/nodes.cpp:
+        (KJS::ConstDeclNode::emitCodeSingle):
+        (KJS::ConstDeclNode::emitCode):
+        (KJS::ConstStatementNode::emitCode):
+        (KJS::VarStatementNode::emitCode):
+        * kjs/nodes.h:
+
 2008-04-24  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -4573 +4573 @@
 }
 
-RegisterID* ConstDeclNode::emitCodeSingle(CodeGenerator& generator, RegisterID* dst)
-{
-    if (RegisterID* constReg = generator.registerForLocalConstInit(m_ident)) {
-        RegisterID* exprResult = generator.emitNode(constReg, m_init.get());
-        return generator.moveToDestinationIfNeeded(dst, exprResult);
-    }
+RegisterID* ConstDeclNode::emitCodeSingle(CodeGenerator& generator)
+{
+    if (RegisterID* constReg = generator.registerForLocalConstInit(m_ident))
+        return generator.emitNode(constReg, m_init.get());
 
     // FIXME: While this code should only be hit in eval code, it will potentially
     // assign to the wrong base if m_ident exists in an intervening dynamic scope.
     RefPtr<RegisterID> constBase = generator.emitResolveBase(generator.newTemporary(), m_ident);
-    RegisterID* exprResult = generator.emitNode(dst, m_init.get());
+    RegisterID* exprResult = generator.emitNode(m_init.get());
     return generator.emitPutPropId(constBase.get(), m_ident, exprResult);
 }
 
-RegisterID* ConstDeclNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ConstDeclNode::emitCode(CodeGenerator& generator, RegisterID*)
 {
     RegisterID* result = 0;
     for (ConstDeclNode* n = this; n; n = n->m_next.get())
-        result = n->emitCodeSingle(generator, n->m_next ? 0 : dst);
+        result = n->emitCodeSingle(generator);
 
     return result;
@@ -4618 +4616 @@
 }
 
-RegisterID* ConstStatementNode::emitCode(CodeGenerator& generator, RegisterID* dst)
-{
-    return generator.emitNode(dst, m_next.get());
+RegisterID* ConstStatementNode::emitCode(CodeGenerator& generator, RegisterID*)
+{
+    return generator.emitNode(m_next.get());
 }
 
@@ -4749 +4747 @@
 // ------------------------------ VarStatementNode ----------------------------
 
-RegisterID* VarStatementNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* VarStatementNode::emitCode(CodeGenerator& generator, RegisterID*)
 {
     ASSERT(m_expr);
-    return generator.emitNode(dst, m_expr.get());
+    return generator.emitNode(m_expr.get());
 }
 

branches/squirrelfish/JavaScriptCore/kjs/nodes.h

@@ -2562 +2562 @@
         
         virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
-        virtual RegisterID* emitCodeSingle(CodeGenerator&, RegisterID*) KJS_FAST_CALL;
+        virtual RegisterID* emitCodeSingle(CodeGenerator&) KJS_FAST_CALL;
     private:
         void handleSlowCase(OldInterpreterExecState*, const ScopeChain&, JSValue*) KJS_FAST_CALL NEVER_INLINE;