Changeset 163151 in webkit

Timestamp:

Jan 30, 2014 7:38:06 PM (10 years ago)

Author:

akling@apple.com

Message:

CodeBlock's cloned SymbolTables only need the captured names.
<​https://webkit.org/b/127978>

Renamed SymbolTable::clone() to SymbolTable::cloneCapturedNames()
and make it skip over any symbols that aren't captured, since those
won't be needed after codegen.

This is a first step towards getting rid of redundant symbol tables.

Reviewed by Geoffrey Garen.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):

• runtime/SymbolTable.cpp:

(JSC::SymbolTable::cloneCapturedNames):

• runtime/SymbolTable.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (1 diff)
• runtime/SymbolTable.cpp (modified) (2 diffs)
• runtime/SymbolTable.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-30  Andreas Kling  <akling@apple.com>
+
+        CodeBlock's cloned SymbolTables only need the captured names.
+        <https://webkit.org/b/127978>
+
+        Renamed SymbolTable::clone() to SymbolTable::cloneCapturedNames()
+        and make it skip over any symbols that aren't captured, since those
+        won't be needed after codegen.
+
+        This is a first step towards getting rid of redundant symbol tables.
+
+        Reviewed by Geoffrey Garen.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::CodeBlock):
+        * runtime/SymbolTable.cpp:
+        (JSC::SymbolTable::cloneCapturedNames):
+        * runtime/SymbolTable.h:
+
 2014-01-28  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1559 +1559 @@
     if (SymbolTable* symbolTable = unlinkedCodeBlock->symbolTable()) {
         if (codeType() == FunctionCode && symbolTable->captureCount()) {
-            m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable->clone(*m_vm));
+            m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable->cloneCapturedNames(*m_vm));
             didCloneSymbolTable = true;
         } else

trunk/Source/JavaScriptCore/runtime/SymbolTable.cpp

@@ -135 +135 @@
 }
 
-SymbolTable* SymbolTable::clone(VM& vm)
+SymbolTable* SymbolTable::cloneCapturedNames(VM& vm)
 {
     SymbolTable* result = SymbolTable::create(vm);
@@ -143 +143 @@
     result->m_captureStart = m_captureStart;
     result->m_captureEnd = m_captureEnd;
-    
-    Map::iterator iter = m_map.begin();
-    Map::iterator end = m_map.end();
-    for (; iter != end; ++iter) {
+
+    for (auto iter = m_map.begin(), end = m_map.end(); iter != end; ++iter) {
+        if (!isCaptured(iter->value.getIndex()))
+            continue;
         result->m_map.add(
             iter->key,

trunk/Source/JavaScriptCore/runtime/SymbolTable.h

@@ -468 +468 @@
     void setSlowArguments(std::unique_ptr<SlowArgument[]> slowArguments) { m_slowArguments = std::move(slowArguments); }
     
-    SymbolTable* clone(VM&);
+    SymbolTable* cloneCapturedNames(VM&);
 
     static void visitChildren(JSCell*, SlotVisitor&);