Changeset 39116 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Dec 8, 2008, 5:06:14 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-08 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Patch for ​https://bugs.webkit.org/show_bug.cgi?id=22716
<rdar://problem/6428315>
Add RareData structure to CodeBlock for infrequently used auxiliary data
members.

Reduces memory on Membuster-head by ~.5MB

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump): (JSC::CodeBlock::dumpStatistics): (JSC::CodeBlock::mark): (JSC::CodeBlock::getHandlerForVPC): (JSC::CodeBlock::nativeExceptionCodeForHandlerVPC): (JSC::CodeBlock::shrinkToFit):
• bytecode/CodeBlock.h: (JSC::CodeBlock::numberOfExceptionHandlers): (JSC::CodeBlock::addExceptionHandler): (JSC::CodeBlock::exceptionHandler): (JSC::CodeBlock::addFunction): (JSC::CodeBlock::function): (JSC::CodeBlock::addUnexpectedConstant): (JSC::CodeBlock::unexpectedConstant): (JSC::CodeBlock::addRegExp): (JSC::CodeBlock::regexp): (JSC::CodeBlock::numberOfImmediateSwitchJumpTables): (JSC::CodeBlock::addImmediateSwitchJumpTable): (JSC::CodeBlock::immediateSwitchJumpTable): (JSC::CodeBlock::numberOfCharacterSwitchJumpTables): (JSC::CodeBlock::addCharacterSwitchJumpTable): (JSC::CodeBlock::characterSwitchJumpTable): (JSC::CodeBlock::numberOfStringSwitchJumpTables): (JSC::CodeBlock::addStringSwitchJumpTable): (JSC::CodeBlock::stringSwitchJumpTable): (JSC::CodeBlock::evalCodeCache): (JSC::CodeBlock::createRareDataIfNecessary):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (5 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -280 +280 @@
         unsigned lastJumpTarget() const { return m_jumpTargets.last(); }
 
-        size_t numberOfExceptionHandlers() const { return m_exceptionHandlers.size(); }
-        void addExceptionHandler(const HandlerInfo& hanler) { return m_exceptionHandlers.append(hanler); }
-        HandlerInfo& exceptionHandler(int index) { return m_exceptionHandlers[index]; }
+        size_t numberOfExceptionHandlers() const { return m_rareData ? m_rareData->m_exceptionHandlers.size() : 0; }
+        void addExceptionHandler(const HandlerInfo& hanler) { createRareDataIfNecessary(); return m_rareData->m_exceptionHandlers.append(hanler); }
+        HandlerInfo& exceptionHandler(int index) { ASSERT(m_rareData); return m_rareData->m_exceptionHandlers[index]; }
 
         void addExpressionInfo(const ExpressionRangeInfo& expressionInfo) { return m_expressionInfo.append(expressionInfo); }
@@ -304 +304 @@
         Register& constantRegister(int index) { return m_constantRegisters[index]; }
 
-        unsigned addFunction(FuncDeclNode* n) { unsigned size = m_functions.size(); m_functions.append(n); return size; }
-        FuncDeclNode* function(int index) const { return m_functions[index].get(); }
-
         unsigned addFunctionExpression(FuncExprNode* n) { unsigned size = m_functionExpressions.size(); m_functionExpressions.append(n); return size; }
         FuncExprNode* functionExpression(int index) const { return m_functionExpressions[index].get(); }
 
-        unsigned addUnexpectedConstant(JSValue* v) { unsigned size = m_unexpectedConstants.size(); m_unexpectedConstants.append(v); return size; }
-        JSValue* unexpectedConstant(int index) const { return m_unexpectedConstants[index]; }
-
-        unsigned addRegExp(RegExp* r) { unsigned size = m_regexps.size(); m_regexps.append(r); return size; }
-        RegExp* regexp(int index) const { return m_regexps[index].get(); }
+        unsigned addFunction(FuncDeclNode* n) { createRareDataIfNecessary(); unsigned size = m_rareData->m_functions.size(); m_rareData->m_functions.append(n); return size; }
+        FuncDeclNode* function(int index) const { ASSERT(m_rareData); return m_rareData->m_functions[index].get(); }
+
+        unsigned addUnexpectedConstant(JSValue* v) { createRareDataIfNecessary(); unsigned size = m_rareData->m_unexpectedConstants.size(); m_rareData->m_unexpectedConstants.append(v); return size; }
+        JSValue* unexpectedConstant(int index) const { ASSERT(m_rareData); return m_rareData->m_unexpectedConstants[index]; }
+
+        unsigned addRegExp(RegExp* r) { createRareDataIfNecessary(); unsigned size = m_rareData->m_regexps.size(); m_rareData->m_regexps.append(r); return size; }
+        RegExp* regexp(int index) const { ASSERT(m_rareData); return m_rareData->m_regexps[index].get(); }
+
 
         // Jump Tables
 
-        size_t numberOfImmediateSwitchJumpTables() const { return m_immediateSwitchJumpTables.size(); }
-        SimpleJumpTable& addImmediateSwitchJumpTable() { m_immediateSwitchJumpTables.append(SimpleJumpTable()); return m_immediateSwitchJumpTables.last(); }
-        SimpleJumpTable& immediateSwitchJumpTable(int tableIndex) { return m_immediateSwitchJumpTables[tableIndex]; }
-
-        size_t numberOfCharacterSwitchJumpTables() const { return m_characterSwitchJumpTables.size(); }
-        SimpleJumpTable& addCharacterSwitchJumpTable() { m_characterSwitchJumpTables.append(SimpleJumpTable()); return m_characterSwitchJumpTables.last(); }
-        SimpleJumpTable& characterSwitchJumpTable(int tableIndex) { return m_characterSwitchJumpTables[tableIndex]; }
-
-        size_t numberOfStringSwitchJumpTables() const { return m_stringSwitchJumpTables.size(); }
-        StringJumpTable& addStringSwitchJumpTable() { m_stringSwitchJumpTables.append(StringJumpTable()); return m_stringSwitchJumpTables.last(); }
-        StringJumpTable& stringSwitchJumpTable(int tableIndex) { return m_stringSwitchJumpTables[tableIndex]; }
+        size_t numberOfImmediateSwitchJumpTables() const { return m_rareData ? m_rareData->m_immediateSwitchJumpTables.size() : 0; }
+        SimpleJumpTable& addImmediateSwitchJumpTable() { createRareDataIfNecessary(); m_rareData->m_immediateSwitchJumpTables.append(SimpleJumpTable()); return m_rareData->m_immediateSwitchJumpTables.last(); }
+        SimpleJumpTable& immediateSwitchJumpTable(int tableIndex) { ASSERT(m_rareData); return m_rareData->m_immediateSwitchJumpTables[tableIndex]; }
+
+        size_t numberOfCharacterSwitchJumpTables() const { return m_rareData ? m_rareData->m_characterSwitchJumpTables.size() : 0; }
+        SimpleJumpTable& addCharacterSwitchJumpTable() { createRareDataIfNecessary(); m_rareData->m_characterSwitchJumpTables.append(SimpleJumpTable()); return m_rareData->m_characterSwitchJumpTables.last(); }
+        SimpleJumpTable& characterSwitchJumpTable(int tableIndex) { ASSERT(m_rareData); return m_rareData->m_characterSwitchJumpTables[tableIndex]; }
+
+        size_t numberOfStringSwitchJumpTables() const { return m_rareData ? m_rareData->m_stringSwitchJumpTables.size() : 0; }
+        StringJumpTable& addStringSwitchJumpTable() { createRareDataIfNecessary(); m_rareData->m_stringSwitchJumpTables.append(StringJumpTable()); return m_rareData->m_stringSwitchJumpTables.last(); }
+        StringJumpTable& stringSwitchJumpTable(int tableIndex) { ASSERT(m_rareData); return m_rareData->m_stringSwitchJumpTables[tableIndex]; }
 
 
         SymbolTable& symbolTable() { return m_symbolTable; }
-        EvalCodeCache& evalCodeCache() { return m_evalCodeCache; }
+
+        EvalCodeCache& evalCodeCache() { createRareDataIfNecessary(); return m_rareData->m_evalCodeCache; }
 
         void shrinkToFit();
@@ -352 +354 @@
 #endif
 
+        void createRareDataIfNecessary()
+        {
+            if (!m_rareData)
+                m_rareData.set(new RareData);
+        }
+
+
         ScopeNode* m_ownerNode;
         JSGlobalData* m_globalData;
@@ -379 +388 @@
         Vector<unsigned> m_jumpTargets;
 
-        Vector<HandlerInfo> m_exceptionHandlers;
         Vector<ExpressionRangeInfo> m_expressionInfo;
         Vector<LineInfo> m_lineInfo;
@@ -390 +398 @@
         Vector<Identifier> m_identifiers;
         Vector<Register> m_constantRegisters;
-        Vector<RefPtr<FuncDeclNode> > m_functions;
         Vector<RefPtr<FuncExprNode> > m_functionExpressions;
-        Vector<JSValue*> m_unexpectedConstants;
-        Vector<RefPtr<RegExp> > m_regexps;
-
-        // Jump Tables
-        Vector<SimpleJumpTable> m_immediateSwitchJumpTables;
-        Vector<SimpleJumpTable> m_characterSwitchJumpTables;
-        Vector<StringJumpTable> m_stringSwitchJumpTables;
 
         SymbolTable m_symbolTable;
 
-        EvalCodeCache m_evalCodeCache;
+        struct RareData {
+            Vector<HandlerInfo> m_exceptionHandlers;
+
+            // Rare Constants
+            Vector<RefPtr<FuncDeclNode> > m_functions;
+            Vector<JSValue*> m_unexpectedConstants;
+            Vector<RefPtr<RegExp> > m_regexps;
+
+            // Jump Tables
+            Vector<SimpleJumpTable> m_immediateSwitchJumpTables;
+            Vector<SimpleJumpTable> m_characterSwitchJumpTables;
+            Vector<StringJumpTable> m_stringSwitchJumpTables;
+
+            EvalCodeCache m_evalCodeCache;
+        };
+
+        OwnPtr<RareData> m_rareData;
     };