Title: [133669] trunk/Source/_javascript_Core
- Revision
- 133669
- Author
- oli...@apple.com
- Date
- 2012-11-06 14:05:49 -0800 (Tue, 06 Nov 2012)
Log Message
Reduce direct m_symbolTable usage in CodeBlock
https://bugs.webkit.org/show_bug.cgi?id=101391
Reviewed by Sam Weinig.
Simple refactoring.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dump):
(JSC::CodeBlock::dumpStatistics):
(JSC::CodeBlock::nameForRegister):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::isCaptured):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (133668 => 133669)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-06 22:01:51 UTC (rev 133668)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-06 22:05:49 UTC (rev 133669)
@@ -1,3 +1,19 @@
+2012-11-06 Oliver Hunt <oli...@apple.com>
+
+ Reduce direct m_symbolTable usage in CodeBlock
+ https://bugs.webkit.org/show_bug.cgi?id=101391
+
+ Reviewed by Sam Weinig.
+
+ Simple refactoring.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dump):
+ (JSC::CodeBlock::dumpStatistics):
+ (JSC::CodeBlock::nameForRegister):
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::isCaptured):
+
2012-11-06 Michael Saboff <msab...@apple.com>
Lexer::scanRegExp, create 8 bit pattern and flag Identifiers from 16 bit source when possible
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (133668 => 133669)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-11-06 22:01:51 UTC (rev 133668)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2012-11-06 22:05:49 UTC (rev 133669)
@@ -492,8 +492,8 @@
static_cast<unsigned long>(instructions().size() * sizeof(Instruction)),
this, codeTypeToString(codeType()), m_numParameters, m_numCalleeRegisters,
m_numVars);
- if (m_symbolTable->captureCount())
- dataLog("; %d captured var(s)", m_symbolTable->captureCount());
+ if (symbolTable()->captureCount())
+ dataLog("; %d captured var(s)", symbolTable()->captureCount());
if (usesArguments()) {
dataLog(
"; uses arguments, in r%d, r%d",
@@ -1491,9 +1491,9 @@
FOR_EACH_MEMBER_VECTOR(GET_STATS)
#undef GET_STATS
- if (!codeBlock->m_symbolTable.isEmpty()) {
+ if (!codeBlock->symbolTable().isEmpty()) {
symbolTableIsNotEmpty++;
- symbolTableTotalSize += (codeBlock->m_symbolTable.capacity() * (sizeof(SymbolTable::KeyType) + sizeof(SymbolTable::MappedType)));
+ symbolTableTotalSize += (codeBlock->symbolTable().capacity() * (sizeof(SymbolTable::KeyType) + sizeof(SymbolTable::MappedType)));
}
if (codeBlock->m_rareData) {
@@ -2807,8 +2807,8 @@
String CodeBlock::nameForRegister(int registerNumber)
{
- SymbolTable::iterator end = m_symbolTable->end();
- for (SymbolTable::iterator ptr = m_symbolTable->begin(); ptr != end; ++ptr) {
+ SymbolTable::iterator end = symbolTable()->end();
+ for (SymbolTable::iterator ptr = symbolTable()->begin(); ptr != end; ++ptr) {
if (ptr->value.getIndex() == registerNumber)
return String(ptr->key);
}
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (133668 => 133669)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-11-06 22:01:51 UTC (rev 133668)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2012-11-06 22:05:49 UTC (rev 133669)
@@ -589,8 +589,8 @@
if (usesArguments() && operand == unmodifiedArgumentsRegister(argumentsRegister()))
return true;
- return operand >= m_symbolTable->captureStart()
- && operand < m_symbolTable->captureEnd();
+ return operand >= symbolTable()->captureStart()
+ && operand < symbolTable()->captureEnd();
}
CodeType codeType() const { return m_codeType; }
@@ -964,7 +964,7 @@
StringJumpTable& stringSwitchJumpTable(int tableIndex) { ASSERT(m_rareData); return m_rareData->m_stringSwitchJumpTables[tableIndex]; }
- SharedSymbolTable* symbolTable() { return m_symbolTable.get(); }
+ SharedSymbolTable* symbolTable() const { return m_symbolTable.get(); }
EvalCodeCache& evalCodeCache() { createRareDataIfNecessary(); return m_rareData->m_evalCodeCache; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
