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

Timestamp:

Nov 1, 2007, 5:14:04 PM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej Stachowiak.

In preparation for making List a simple stack-allocated Vector:

Removed all instances of List copying and/or assignment, and made List
inherit from Noncopyable.

Functions that used to return a List by copy now take List& out
parameters.

Layout tests and JS tests pass.

• kjs/list.cpp: (KJS::List::slice): Replaced copyTail with a more generic slice alternative. (JavaScriptCore only calls slice(1), but WebCore calls slice(2)).

WebCore:

Reviewed by Maciej Stachowiak.

In preparation for making List a simple stack-allocated Vector:

Removed all instances of List copying, assignment, and/or storage.

Layout tests and JS tests pass.

• bindings/js/kjs_window.cpp: (KJS::WindowFunc::callAsFunction): Stores a Vector of protected JSValue*'s instead of a List now. Converts to List on the fly when calling the timer function. This is slightly less efficient, but the common case is 0-2 arguments, so it's no biggie.

(HTML iBench shows no regression. PLT does not use JS timers.)

(KJS::ScheduledAction::execute): Uses the more efficient and non-copying
List::slice now.
(KJS::ScheduledAction::ScheduledAction): ditto

• bindings/objc/WebScriptObject.mm: (getListFromNSArray): Takes a List out parameter now, to avoid copying.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -58 +58 @@
   if (exec->hadException()) { \
     handleException(exec); \
-    return List(); \
+    return; \
   }
 
@@ -611 +611 @@
 
 // ECMA 11.2.4
-List ArgumentListNode::evaluateList(ExecState *exec)
-{
-  List l;
-
+void ArgumentListNode::evaluateList(ExecState* exec, List& list)
+{
   for (ArgumentListNode *n = this; n; n = n->next.get()) {
     JSValue *v = n->expr->evaluate(exec);
     KJS_CHECKEXCEPTIONLIST
-    l.append(v);
+    list.append(v);
   }
-
-  return l;
 }
 
@@ -628 +624 @@
 void ArgumentsNode::optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack& nodeStack)
 {
-    if (list)
-        nodeStack.append(list.get());
+    if (listNode)
+        nodeStack.append(listNode.get());
 }
 
@@ -656 +652 @@
   List argList;
   if (args) {
-    argList = args->evaluateList(exec);
+    args->evaluateList(exec, argList);
     KJS_CHECKEXCEPTIONVALUE
   }
@@ -694 +690 @@
   }
 
-  List argList = args->evaluateList(exec);
+  List argList;
+  args->evaluateList(exec, argList);
   KJS_CHECKEXCEPTIONVALUE
 
@@ -742 +739 @@
       }
       
-      List argList = args->evaluateList(exec);
+      List argList;
+      args->evaluateList(exec, argList);
       KJS_CHECKEXCEPTIONVALUE
         
@@ -777 +775 @@
         return throwError(exec, TypeError, "Object %s (result of expression %s) does not allow calls.", v, ident);
       
-    List argList = args->evaluateList(exec);
+    List argList;
+    args->evaluateList(exec, argList);
     KJS_CHECKEXCEPTIONVALUE
 
@@ -828 +827 @@
   }
 
-  List argList = args->evaluateList(exec);
+  List argList;
+  args->evaluateList(exec, argList);
   KJS_CHECKEXCEPTIONVALUE
 
@@ -876 +876 @@
     return throwError(exec, TypeError, dotExprDoesNotAllowCallsString(), funcVal, base.get(), ident);
 
-  List argList = args->evaluateList(exec);
+  List argList;
+  args->evaluateList(exec, argList);
   KJS_CHECKEXCEPTIONVALUE