Changeset 89954 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

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/interpreter/Interpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -1607 +1607 @@
          Constructs a new Array instance using the original
          constructor, and puts the result in register dst.
-         The array be initialized with the values from immediateBuffer[index]
+         The array be initialized with the values from constantBuffer[index]
          */
         int dst = vPC[1].u.operand;
         int firstArg = vPC[2].u.operand;
         int argCount = vPC[3].u.operand;
-        ArgList args(codeBlock->immediateBuffer(firstArg), argCount);
+        ArgList args(codeBlock->constantBufferfirstArg), argCount);
         callFrame->uncheckedR(dst) = JSValue(constructArray(callFrame, args));