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

Timestamp:

Oct 29, 2007, 8:14:00 PM (18 years ago)

Author:

oliver

Message:

Debranching various Node::evaluate implementations

Reviewed by Maciej.

Split the read-modify-write assignment cases out of AssignResolveNode and into ReadModifyResolveNode
Split the increment and decrement cases for Prefix- and Postfix- ResolveNode, BracketNode, and DotNode

Gains 1.6% on SunSpider

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -893 +893 @@
 // ------------------------------ PostfixResolveNode ----------------------------------
 
-void PostfixResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+// Increment
+void PostIncResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
 {
     size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
     if (index != missingSymbolMarker())
-        new (this) LocalVarPostfixNode(index);
-}
-
-JSValue *PostfixResolveNode::evaluate(ExecState *exec)
+        new (this) PostIncLocalVarNode(index);
+}
+
+JSValue *PostIncResolveNode::evaluate(ExecState *exec)
 {
   // Check for missed optimization opportunity.
@@ -920 +921 @@
 
         double n = v->toNumber(exec);
-        
-        double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-        base->put(exec, m_ident, jsNumber(newValue));
-        
+        base->put(exec, m_ident, jsNumber(n + 1));
         return jsNumber(n);
     }
@@ -933 +931 @@
 }
 
-JSValue* LocalVarPostfixNode::evaluate(ExecState* exec)
+JSValue* PostIncLocalVarNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -941 +939 @@
     JSValue** slot = &variableObject->localStorage()[index].value;
     double n = (*slot)->toNumber(exec);
-    double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    *slot = jsNumber(newValue);
+    *slot = jsNumber(n + 1);
+    return jsNumber(n);
+}
+
+
+// Decrement
+void PostDecResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+{
+    size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
+    if (index != missingSymbolMarker())
+        new (this) PostDecLocalVarNode(index);
+}
+
+JSValue *PostDecResolveNode::evaluate(ExecState *exec)
+{
+  // Check for missed optimization opportunity.
+  ASSERT(!canSkipLookup(exec, m_ident));
+
+  const ScopeChain& chain = exec->scopeChain();
+  ScopeChainIterator iter = chain.begin();
+  ScopeChainIterator end = chain.end();
+  
+  // we must always have something in the scope chain
+  ASSERT(iter != end);
+
+  PropertySlot slot;
+  JSObject *base;
+  do { 
+    base = *iter;
+    if (base->getPropertySlot(exec, m_ident, slot)) {
+        JSValue *v = slot.getValue(exec, base, m_ident);
+
+        double n = v->toNumber(exec);
+        base->put(exec, m_ident, jsNumber(n - 1));
+        return jsNumber(n);
+    }
+
+    ++iter;
+  } while (iter != end);
+
+  return throwUndefinedVariableError(exec, m_ident);
+}
+
+JSValue* PostDecLocalVarNode::evaluate(ExecState* exec)
+{
+    ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
+    ASSERT(variableObject->isActivation());
+    ASSERT(variableObject == exec->scopeChain().top());
+
+    JSValue** slot = &variableObject->localStorage()[index].value;
+    double n = (*slot)->toNumber(exec);
+    *slot = jsNumber(n - 1);
     return jsNumber(n);
 }
@@ -954 +1002 @@
 }
 
-JSValue *PostfixBracketNode::evaluate(ExecState *exec)
+JSValue *PostIncBracketNode::evaluate(ExecState *exec)
 {
   JSValue *baseValue = m_base->evaluate(exec);
@@ -971 +1019 @@
     double n = v->toNumber(exec);
 
-    double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    base->put(exec, propertyIndex, jsNumber(newValue));
+    base->put(exec, propertyIndex, jsNumber(n + 1));
         
     return jsNumber(n);
@@ -984 +1031 @@
   double n = v->toNumber(exec);
   
-  double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  base->put(exec, propertyName, jsNumber(newValue));
+  base->put(exec, propertyName, jsNumber(n + 1));
         
   return jsNumber(n);
 }
 
+JSValue *PostDecBracketNode::evaluate(ExecState *exec)
+{
+  JSValue *baseValue = m_base->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  JSValue *subscript = m_subscript->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+
+  JSObject *base = baseValue->toObject(exec);
+
+  uint32_t propertyIndex;
+  if (subscript->getUInt32(propertyIndex)) {
+    PropertySlot slot;
+    JSValue *v = base->getPropertySlot(exec, propertyIndex, slot) ? slot.getValue(exec, base, propertyIndex) : jsUndefined();
+    KJS_CHECKEXCEPTIONVALUE
+
+    double n = v->toNumber(exec);
+
+    base->put(exec, propertyIndex, jsNumber(n - 1));
+        
+    return jsNumber(n);
+  }
+
+  Identifier propertyName(subscript->toString(exec));
+  PropertySlot slot;
+  JSValue *v = base->getPropertySlot(exec, propertyName, slot) ? slot.getValue(exec, base, propertyName) : jsUndefined();
+  KJS_CHECKEXCEPTIONVALUE
+
+  double n = v->toNumber(exec);
+  
+  base->put(exec, propertyName, jsNumber(n - 1));
+        
+  return jsNumber(n);
+}
+
 // ------------------------------ PostfixDotNode ----------------------------------
 
@@ -997 +1077 @@
 }
 
-JSValue *PostfixDotNode::evaluate(ExecState *exec)
+JSValue *PostIncDotNode::evaluate(ExecState *exec)
 {
   JSValue *baseValue = m_base->evaluate(exec);
@@ -1009 +1089 @@
   double n = v->toNumber(exec);
   
-  double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  base->put(exec, m_ident, jsNumber(newValue));
+  base->put(exec, m_ident, jsNumber(n + 1));
+        
+  return jsNumber(n);
+}
+
+JSValue *PostDecDotNode::evaluate(ExecState *exec)
+{
+  JSValue *baseValue = m_base->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  JSObject *base = baseValue->toObject(exec);
+
+  PropertySlot slot;
+  JSValue *v = base->getPropertySlot(exec, m_ident, slot) ? slot.getValue(exec, base, m_ident) : jsUndefined();
+  KJS_CHECKEXCEPTIONVALUE
+
+  double n = v->toNumber(exec);
+  
+  base->put(exec, m_ident, jsNumber(n - 1));
         
   return jsNumber(n);
@@ -1230 +1326 @@
 // ------------------------------ PrefixResolveNode ----------------------------------
 
-void PrefixResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+void PreIncResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
 {
     size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
     if (index != missingSymbolMarker())
-        new (this) LocalVarPrefixNode(index);
-}
-
-JSValue* LocalVarPrefixNode::evaluate(ExecState* exec)
+        new (this) PreIncLocalVarNode(index);
+}
+
+JSValue* PreIncLocalVarNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -1245 +1341 @@
 
     double n = v->toNumber(exec);
-        
-    double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    JSValue* n2 = jsNumber(newValue);
+    JSValue* n2 = jsNumber(n + 1);
     variableObject->localStorage()[m_index].value = n2;
     return n2;
 }
 
-JSValue *PrefixResolveNode::evaluate(ExecState *exec)
+JSValue *PreIncResolveNode::evaluate(ExecState *exec)
 {
   const ScopeChain& chain = exec->scopeChain();
@@ -1269 +1363 @@
 
         double n = v->toNumber(exec);
-        
-        double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-        JSValue *n2 = jsNumber(newValue);
+        JSValue *n2 = jsNumber(n + 1);
         base->put(exec, m_ident, n2);
 
@@ -1283 +1375 @@
 }
 
+void PreDecResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack&)
+{
+    size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
+    if (index != missingSymbolMarker())
+        new (this) PreDecLocalVarNode(index);
+}
+
+JSValue* PreDecLocalVarNode::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);
+    JSValue* n2 = jsNumber(n - 1);
+    variableObject->localStorage()[m_index].value = n2;
+    return n2;
+}
+
+JSValue *PreDecResolveNode::evaluate(ExecState *exec)
+{
+  const ScopeChain& chain = exec->scopeChain();
+  ScopeChainIterator iter = chain.begin();
+  ScopeChainIterator end = chain.end();
+  
+  // we must always have something in the scope chain
+  ASSERT(iter != end);
+
+  PropertySlot slot;
+  JSObject *base;
+  do { 
+    base = *iter;
+    if (base->getPropertySlot(exec, m_ident, slot)) {
+        JSValue *v = slot.getValue(exec, base, m_ident);
+
+        double n = v->toNumber(exec);
+        JSValue *n2 = jsNumber(n - 1);
+        base->put(exec, m_ident, n2);
+
+        return n2;
+    }
+
+    ++iter;
+  } while (iter != end);
+
+  return throwUndefinedVariableError(exec, m_ident);
+}
+
 // ------------------------------ PrefixBracketNode ----------------------------------
 
@@ -1291 +1432 @@
 }
 
-JSValue *PrefixBracketNode::evaluate(ExecState *exec)
+JSValue *PreIncBracketNode::evaluate(ExecState *exec)
 {
   JSValue *baseValue = m_base->evaluate(exec);
@@ -1306 +1447 @@
     KJS_CHECKEXCEPTIONVALUE
 
-    double n = v->toNumber(exec);
-
-    double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    JSValue *n2 = jsNumber(newValue);
+    JSValue *n2 = jsNumber(v->toNumber(exec) + 1);
     base->put(exec, propertyIndex, n2);
 
@@ -1320 +1458 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  double n = v->toNumber(exec);
-  
-  double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  JSValue *n2 = jsNumber(newValue);
+  JSValue *n2 = jsNumber(v->toNumber(exec) + 1);
   base->put(exec, propertyName, n2);
 
@@ -1329 +1464 @@
 }
 
+JSValue *PreDecBracketNode::evaluate(ExecState *exec)
+{
+  JSValue *baseValue = m_base->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  JSValue *subscript = m_subscript->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+
+  JSObject *base = baseValue->toObject(exec);
+
+  uint32_t propertyIndex;
+  if (subscript->getUInt32(propertyIndex)) {
+    PropertySlot slot;
+    JSValue *v = base->getPropertySlot(exec, propertyIndex, slot) ? slot.getValue(exec, base, propertyIndex) : jsUndefined();
+    KJS_CHECKEXCEPTIONVALUE
+
+    JSValue *n2 = jsNumber(v->toNumber(exec) - 1);
+    base->put(exec, propertyIndex, n2);
+
+    return n2;
+  }
+
+  Identifier propertyName(subscript->toString(exec));
+  PropertySlot slot;
+  JSValue *v = base->getPropertySlot(exec, propertyName, slot) ? slot.getValue(exec, base, propertyName) : jsUndefined();
+  KJS_CHECKEXCEPTIONVALUE
+
+  JSValue *n2 = jsNumber(v->toNumber(exec) - 1);
+  base->put(exec, propertyName, n2);
+
+  return n2;
+}
+
 // ------------------------------ PrefixDotNode ----------------------------------
 
@@ -1336 +1503 @@
 }
 
-JSValue *PrefixDotNode::evaluate(ExecState *exec)
+JSValue *PreIncDotNode::evaluate(ExecState *exec)
 {
   JSValue *baseValue = m_base->evaluate(exec);
@@ -1347 +1514 @@
 
   double n = v->toNumber(exec);
-  
-  double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  JSValue *n2 = jsNumber(newValue);
+  JSValue *n2 = jsNumber(n + 1);
+  base->put(exec, m_ident, n2);
+
+  return n2;
+}
+
+JSValue *PreDecDotNode::evaluate(ExecState *exec)
+{
+  JSValue *baseValue = m_base->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+  JSObject *base = baseValue->toObject(exec);
+
+  PropertySlot slot;
+  JSValue *v = base->getPropertySlot(exec, m_ident, slot) ? slot.getValue(exec, base, m_ident) : jsUndefined();
+  KJS_CHECKEXCEPTIONVALUE
+
+  double n = v->toNumber(exec);
+  JSValue *n2 = jsNumber(n - 1);
   base->put(exec, m_ident, n2);
 
@@ -1999 +2181 @@
 }
 
-// ------------------------------ AssignResolveNode -----------------------------------
-
-void AssignResolveNode::optimizeVariableAccess(FunctionBodyNode* functionBody, DeclarationStacks::NodeStack& nodeStack)
+// ------------------------------ ReadModifyResolveNode -----------------------------------
+
+void ReadModifyResolveNode::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) LocalVarAssignNode(index);
-}
-
-JSValue* LocalVarAssignNode::evaluate(ExecState* exec)
+        new (this) ReadModifyLocalVarNode(index);
+}
+
+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) AssignLocalVarNode(index);
+}
+
+JSValue* ReadModifyLocalVarNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -2030 +2220 @@
 }
 
-JSValue *AssignResolveNode::evaluate(ExecState *exec)
+JSValue* AssignLocalVarNode::evaluate(ExecState* exec)
+{
+    ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
+    ASSERT(variableObject->isActivation());
+    ASSERT(variableObject == exec->scopeChain().top());
+    JSValue* v = m_right->evaluate(exec);
+
+    KJS_CHECKEXCEPTIONVALUE
+
+    variableObject->localStorage()[m_index].value = v;
+    
+    return v;
+}
+
+JSValue *ReadModifyResolveNode::evaluate(ExecState *exec)
 {
   const ScopeChain& chain = exec->scopeChain();
@@ -2063 +2267 @@
     v = valueForReadModifyAssignment(exec, v1, v2, m_oper);
   }
+
+  KJS_CHECKEXCEPTIONVALUE
+
+  base->put(exec, m_ident, v);
+  return v;
+}
+
+JSValue *AssignResolveNode::evaluate(ExecState *exec)
+{
+  const ScopeChain& chain = exec->scopeChain();
+  ScopeChainIterator iter = chain.begin();
+  ScopeChainIterator end = chain.end();
+  
+  // we must always have something in the scope chain
+  ASSERT(iter != end);
+
+  PropertySlot slot;
+  JSObject *base;
+  do { 
+    base = *iter;
+    if (base->getPropertySlot(exec, m_ident, slot))
+      goto found;
+
+    ++iter;
+  } while (iter != end);
+
+ found:
+  JSValue *v = m_right->evaluate(exec);
 
   KJS_CHECKEXCEPTIONVALUE