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

Timestamp:

Oct 29, 2007, 12:17:09 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Oliver Hunt.

Some small tweaks that I notice while reviewing Oliver's last patch.

Includes removal of an unnecessary KJS_CHECKEXCEPTIONVALUE.

No change in SunSpider because SunSpider doesn't take the code path that
would execute the unnecessary KJS_CHECKEXCEPTIONVALUE much.

• kjs/nodes.cpp: (KJS::LocalVarPostfixNode::evaluate): (KJS::TypeOfResolveNode::optimizeVariableAccess): (KJS::LocalVarTypeOfNode::evaluate): (KJS::PrefixResolveNode::optimizeVariableAccess): (KJS::LocalVarPrefixNode::evaluate): (KJS::AssignResolveNode::optimizeVariableAccess): (KJS::LocalVarAssignNode::evaluate):
• kjs/nodes.h: (KJS::LocalVarTypeOfNode::): (KJS::PrefixResolveNode::): (KJS::LocalVarPrefixNode::): (KJS::AssignResolveNode::): (KJS::LocalVarAssignNode::):

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -939 +939 @@
     ASSERT(variableObject == exec->scopeChain().top());
 
-    JSValue** v = &variableObject->localStorage()[index].value;
-    double n = (*v)->toNumber(exec);
+    JSValue** slot = &variableObject->localStorage()[index].value;
+    double n = (*slot)->toNumber(exec);
     double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    *v = jsNumber(newValue);
+    *slot = jsNumber(newValue);
     return jsNumber(n);
 }
@@ -1181 +1181 @@
     size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
     if (index != missingSymbolMarker())
-        new (this) LocalTypeOfAccessNode(index);
-}
-
-JSValue* LocalTypeOfAccessNode::evaluate(ExecState* exec)
+        new (this) LocalVarTypeOfNode(index);
+}
+
+JSValue* LocalVarTypeOfNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -1234 +1234 @@
     size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
     if (index != missingSymbolMarker())
-        new (this) PrefixLocalAccessNode(index);
-}
-
-JSValue* PrefixLocalAccessNode::evaluate(ExecState* exec)
+        new (this) LocalVarPrefixNode(index);
+}
+
+JSValue* LocalVarPrefixNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -2006 +2006 @@
     size_t index = functionBody->symbolTable().get(m_ident.ustring().rep());
     if (index != missingSymbolMarker())
-        new (this) AssignLocalAccessNode(index);
-}
-
-JSValue* AssignLocalAccessNode::evaluate(ExecState* exec)
+        new (this) LocalVarAssignNode(index);
+}
+
+JSValue* LocalVarAssignNode::evaluate(ExecState* exec)
 {
     ActivationImp* variableObject = static_cast<ActivationImp*>(exec->variableObject());
@@ -2015 +2015 @@
     ASSERT(variableObject == exec->scopeChain().top());
     JSValue* v;
+    JSValue** slot = &variableObject->localStorage()[m_index].value;
 
     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);
+        v = valueForReadModifyAssignment(exec, *slot, v2, m_oper);
     }
 
     KJS_CHECKEXCEPTIONVALUE
 
-    variableObject->localStorage()[m_index].value = v;
+    *slot = v;
     return v;
 }