Changeset 89954 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Jun 28, 2011, 1:21:37 PM (14 years ago)

Author:

[email protected]

Message:

2011-06-28 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Make constant array optimisation less strict about what constitutes a constant
​https://bugs.webkit.org/show_bug.cgi?id=63554

Now allow string constants in array literals to actually be considered constant,
and so avoid codegen in array literals with strings in them.

• bytecode/CodeBlock.h: (JSC::CodeBlock::addConstantBuffer): (JSC::CodeBlock::constantBuffer):
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::addConstantBuffer): (JSC::BytecodeGenerator::addStringConstant): (JSC::BytecodeGenerator::emitNewArray):
• bytecompiler/BytecodeGenerator.h:
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute):
• jit/JITStubs.cpp: (JSC::DEFINE_STUB_FUNCTION):

File:

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

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -478 +478 @@
         RegExp* regexp(int index) const { ASSERT(m_rareData); return m_rareData->m_regexps[index].get(); }
 
-        unsigned addImmediateBuffer(unsigned length)
+        unsigned addConstantBuffer(unsigned length)
         {
             createRareDataIfNecessary();
-            unsigned size = m_rareData->m_immediateBuffers.size();
-            m_rareData->m_immediateBuffers.append(Vector<JSValue>(length));
+            unsigned size = m_rareData->m_constantBuffers.size();
+            m_rareData->m_constantBuffers.append(Vector<JSValue>(length));
             return size;
         }
 
-        JSValue* immediateBuffer(unsigned index)
+        JSValue* constantBuffer(unsigned index)
         {
             ASSERT(m_rareData);
-            return m_rareData->m_immediateBuffers[index].data();
+            return m_rareData->m_constantBuffers[index].data();
         }
 
@@ -596 +596 @@
 
             // Buffers used for large array literals
-            Vector<Vector<JSValue> > m_immediateBuffers;
+            Vector<Vector<JSValue> > m_constantBuffers;
             
             // Jump Tables