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

Timestamp:

Nov 24, 2002, 2:37:44 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• changed ScopeChain to not ref each item in the chain, and use marking instead; gains 1% on JavaScript iBench

• kjs/context.h: Return chain by reference.
• kjs/internal.cpp: (ContextImp::mark): Mark the scope chain.
• kjs/interpreter.cpp: (Context::scopeChain): Return chain by reference.
• kjs/interpreter.h: Make some Context methods inline.
• kjs/nodes.cpp: (ThisNode::evaluate): Get at ContextImp directly. (ResolveNode::evaluateReference): Ditto. (VarDeclNode::evaluate): Ditto. (VarDeclNode::processVarDecls): Ditto. (FuncDeclNode::processFuncDecl): Pass ScopeChain directly to avoid copying. (FuncExprNode::evaluate): Ditto.
• kjs/object.cpp: Make scope and setScope inline.
• kjs/object.h: Make scope return a chain by reference. Make scope and setScope both be inline. Use a normal ScopeChain instead of NoRefScopeChain since they are now one and the same.
• kjs/scope_chain.cpp: Remove all the code to ref and deref objects. Merge NoRefScopeChain in with ScopeChain since they both work this way now.
• kjs/scope_chain.h: Remove NoRefScopeChain and simplify the ref counts. Make more functions inline.

WebCore:

• force-js-clean-timestamp: Touch for ScopeChain change.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -206 +206 @@
 Value ThisNode::evaluate(ExecState *exec)
 {
-  return exec->context().thisValue();
+  return exec->context().imp()->thisValue();
 }
 
@@ -219 +219 @@
 Reference ResolveNode::evaluateReference(ExecState *exec)
 {
-  ScopeChain chain = exec->context().scopeChain();
+  ScopeChain chain = exec->context().imp()->scopeChain();
 
   while (!chain.isEmpty()) {
@@ -1633 +1633 @@
 Value VarDeclNode::evaluate(ExecState *exec)
 {
-  Object variable = Object::dynamicCast(exec->context().variableObject());
+  Object variable = Object::dynamicCast(exec->context().imp()->variableObject());
 
   Value val;
@@ -1657 +1657 @@
 void VarDeclNode::processVarDecls(ExecState *exec)
 {
-  Object variable = exec->context().variableObject();
+  Object variable = exec->context().imp()->variableObject();
   variable.put(exec,ident, Undefined(), DontDelete);
 }
@@ -2780 +2780 @@
 void FuncDeclNode::processFuncDecl(ExecState *exec)
 {
-  const ScopeChain sc = exec->context().imp()->scopeChain();
-
   // TODO: let this be an object with [[Class]] property "Function"
-  FunctionImp *fimp = new DeclaredFunctionImp(exec, ident, body, sc);
+  FunctionImp *fimp = new DeclaredFunctionImp(exec, ident, body, exec->context().imp()->scopeChain());
   Object func(fimp); // protect from GC
 
@@ -2835 +2833 @@
 Value FuncExprNode::evaluate(ExecState *exec)
 {
-  const ScopeChain sc = exec->context().scopeChain();
-  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null, body, sc);
+  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null, body, exec->context().imp()->scopeChain());
   Value ret(fimp);
   List empty;