Changeset 27216 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Oct 29, 2007, 12:05:49 AM (18 years ago)

Author:

oliver

Message:

Added nodes to allow Assignment, TypeOf, and prefix operators to
make use of the new optimised local variable look up.

5% gain on sunspider

Reviewed by Darin

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1177 +1177 @@
 }
 
+void TypeOfResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+{
+    size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
+    if (index != missingSymbolMarker())
+        new (this) LocalTypeOfAccessNode(index);
+}
+
+JSValue* LocalTypeOfAccessNode::evaluate(ExecState* exec)
+{
+    ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
+    ASSERT(variableObject->isActivation());
+    ASSERT(variableObject == exec->scopeChain().top());
+    return typeStringForValue(variableObject->localStorage()[m_index].value);
+}
+
 JSValue *TypeOfResolveNode::evaluate(ExecState *exec)
 {
@@ -1214 +1229 @@
 
 // ------------------------------ PrefixResolveNode ----------------------------------
+
+void PrefixResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+{
+    size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
+    if (index != missingSymbolMarker())
+        new (this) PrefixLocalAccessNode(index);
+}
+
+JSValue* PrefixLocalAccessNode::evaluate(ExecState* exec)
+{
+    ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
+    ASSERT(variableObject->isActivation());
+    ASSERT(variableObject == exec->scopeChain().top());
+    JSValue* v = variableObject->localStorage()[m_index].value;
+
+    double n = v->toNumber(exec);
+        
+    double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
+    JSValue* n2 = jsNumber(newValue);
+    variableObject->localStorage()[m_index].value = n2;
+    return n2;
+}
 
 JSValue *PrefixResolveNode::evaluate(ExecState *exec)
@@ -1964 +2001 @@
 // ------------------------------ AssignResolveNode -----------------------------------
 
-void AssignResolveNode::optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack& nodeStack)
+void AssignResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack& nodeStack)
 {
     nodeStack.append(m_right.get());
+    size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
+    if (index != missingSymbolMarker())
+        new (this) AssignLocalAccessNode(index);
+}
+
+JSValue* AssignLocalAccessNode::evaluate(ExecState* exec)
+{
+    ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
+    ASSERT(variableObject->isActivation());
+    ASSERT(variableObject == exec->scopeChain().top());
+    JSValue* v;
+
+    if (m_oper == OpEqual)
+        v = m_right->evaluate(exec);
+    else {
+        JSValue* v1 = variableObject->localStorage()[m_index].value;
+        KJS_CHECKEXCEPTIONVALUE
+        JSValue* v2 = m_right->evaluate(exec);
+        v = valueForReadModifyAssignment(exec, v1, v2, m_oper);
+    }
+
+    KJS_CHECKEXCEPTIONVALUE
+
+    variableObject->localStorage()[m_index].value = v;
+    return v;
 }