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

Timestamp:

Jun 28, 2008, 8:50:49 AM (17 years ago)

Author:

Darin Adler

Message:

2008-06-28 Darin Adler <Darin Adler>

Reviewed by Oliver.

• ​https://bugs.webkit.org/show_bug.cgi?id=19787 create most arrays from values in registers rather than with multiple put operations

SunSpider says 0.8% faster.

• VM/CodeBlock.cpp: (KJS::CodeBlock::dump): Added argv and argc parameters to new_array.
• VM/Machine.cpp: (KJS::Machine::privateExecute): Ditto.

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitNewArray): Added.
• VM/CodeGenerator.h: Added ElementNode* argument to emitNewArray.

• kjs/nodes.cpp: (KJS::ArrayNode::emitCode): Pass the ElementNode to emitNewArray so it can be initialized with as many elements as possible. If the array doesn't have any holes in it, that's all that's needed. If there are holes, then emit some separate put operations for the other values in the array and for the length as needed.

• kjs/nodes.h: Added some accessors to ElementNode so the code generator can iterate through elements and generate code to evaluate them. Now ArrayNode does not need to be a friend. Also took out some unused PlacementNewAdoptType constructors.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -48 +48 @@
 namespace KJS {
 
-static inline UString::Rep* rep(const Identifier& ident)
-{
-    return ident.ustring().rep();
-}
-
 // ------------------------------ Node -----------------------------------------
 
 #ifndef NDEBUG
+
 #ifndef LOG_CHANNEL_PREFIX
 #define LOG_CHANNEL_PREFIX Log
 #endif
+
 static WTFLogChannel LogKJSNodeLeaks = { 0x00000000, "", WTFLogChannelOn };
 
@@ -100 +97 @@
     --count;
 }
+
 #endif
 
@@ -215 +213 @@
 }
 
-static inline int currentSourceId(ExecState* exec) KJS_FAST_CALL;
-static inline int currentSourceId(ExecState*)
-{
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-static inline const UString currentSourceURL(ExecState* exec) KJS_FAST_CALL;
-static inline const UString currentSourceURL(ExecState*)
-{
-    ASSERT_NOT_REACHED();
-    return UString();
-}
-
 RegisterID* Node::emitThrowError(CodeGenerator& generator, ErrorType e, const char* msg)
 {
@@ -346 +330 @@
 // ------------------------------ ArrayNode ------------------------------------
 
-
 RegisterID* ArrayNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 {
-    RefPtr<RegisterID> newArray = generator.emitNewArray(generator.tempDestination(dst));
+    // FIXME: Should we put all of this code into emitNewArray?
+
     unsigned length = 0;
-
-    RegisterID* value;
-    for (ElementNode* n = m_element.get(); n; n = n->m_next.get()) {
-        value = generator.emitNode(n->m_node.get());
-        length += n->m_elision;
-        generator.emitPutByIndex(newArray.get(), length++, value);
-    }
-
-    value = generator.emitLoad(generator.newTemporary(), jsNumber(generator.globalExec(), m_elision + length));
-    generator.emitPutById(newArray.get(), generator.propertyNames().length, value);
-
-    return generator.moveToDestinationIfNeeded(dst, newArray.get());
+    ElementNode* firstPutElement;
+    for (firstPutElement = m_element.get(); firstPutElement; firstPutElement = firstPutElement->next()) {
+        if (firstPutElement->elision())
+            break;
+        ++length;
+    }
+
+    if (!firstPutElement && !m_elision)
+        return generator.emitNewArray(generator.finalDestination(dst), m_element.get());
+
+    RefPtr<RegisterID> array = generator.emitNewArray(generator.tempDestination(dst), m_element.get());
+
+    for (ElementNode* n = firstPutElement; n; n = n->next()) {
+        RegisterID* value = generator.emitNode(n->value());
+        length += n->elision();
+        generator.emitPutByIndex(array.get(), length++, value);
+    }
+
+    if (m_elision) {
+        RegisterID* value = generator.emitLoad(generator.newTemporary(), jsNumber(generator.globalExec(), m_elision + length));
+        generator.emitPutById(array.get(), generator.propertyNames().length, value);
+    }
+
+    return generator.moveToDestinationIfNeeded(dst, array.get());
 }
 
@@ -371 +367 @@
     if (m_list)
         return generator.emitNode(dst, m_list.get());
-    else
-        return generator.emitNewObject(generator.finalDestination(dst));
+    return generator.emitNewObject(generator.finalDestination(dst));
 }