Changeset 57955 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Apr 20, 2010, 11:41:20 PM (15 years ago)

Author:

[email protected]

Message:

2010-04-20 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

[ES5] RegExp literals are constants that should be persistent across multiple function calls.
​https://bugs.webkit.org/show_bug.cgi?id=37908

Dump the separate RegExp constant pool, and just use the standard JS constant pool
in codeblock. This allows us to drop op_new_regexp and all associated code as well.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump): (JSC::CodeBlock::shrinkToFit):
• bytecode/CodeBlock.h:
• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::emitLoad):
• bytecompiler/BytecodeGenerator.h:
• bytecompiler/NodesCodegen.cpp: (JSC::RegExpNode::emitBytecode):
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):
• jit/JIT.h:
• jit/JITOpcodes.cpp:
• jit/JITStubs.cpp:
• jit/JITStubs.h: (JSC::):

2010-04-20 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

[ES5] RegExp literals are constants that should be persistent across multiple function calls.
​https://bugs.webkit.org/show_bug.cgi?id=37908

Add tests to ensure correct persistence of RegExp literals, and correctly avoid
sharing "identical" regexps used in different places.

• fast/js/regexp-literals-are-constants-expected.txt: Added.
• fast/js/regexp-literals-are-constants.html: Added.
• fast/js/script-tests/regexp-literals-are-constants.js: Added. (test1): (returnRegExpLiteral): (returnConditionalRegExpLiteral):

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (4 diffs)
• CodeBlock.h (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -90 +90 @@
 }
 
-static UString regexpToSourceString(RegExp* regExp)
-{
-    char postfix[5] = { '/', 0, 0, 0, 0 };
-    int index = 1;
-    if (regExp->global())
-        postfix[index++] = 'g';
-    if (regExp->ignoreCase())
-        postfix[index++] = 'i';
-    if (regExp->multiline())
-        postfix[index] = 'm';
-
-    return makeString("/", regExp->pattern(), postfix);
-}
-
-static CString regexpName(int re, RegExp* regexp)
-{
-    return makeString(regexpToSourceString(regexp), "(@re", UString::from(re), ")").UTF8String();
-}
-
 static UString pointerToSourceString(void* p)
 {
@@ -365 +346 @@
     }
 
-    if (m_rareData && !m_rareData->m_regexps.isEmpty()) {
-        printf("\nm_regexps:\n");
-        size_t i = 0;
-        do {
-            printf("  re%u = %s\n", static_cast<unsigned>(i), regexpToSourceString(m_rareData->m_regexps[i].get()).ascii());
-            ++i;
-        } while (i < m_rareData->m_regexps.size());
-    }
-
 #if ENABLE(JIT)
     if (!m_globalResolveInfos.isEmpty() || !m_structureStubInfos.isEmpty())
@@ -509 +481 @@
             int argc = (++it)->u.operand;
             printf("[%4d] new_array\t %s, %s, %d\n", location, registerName(exec, dst).data(), registerName(exec, argv).data(), argc);
-            break;
-        }
-        case op_new_regexp: {
-            int r0 = (++it)->u.operand;
-            int re0 = (++it)->u.operand;
-            printf("[%4d] new_regexp\t %s, %s\n", location, registerName(exec, r0).data(), regexpName(re0, regexp(re0)).data());
             break;
         }
@@ -1708 +1674 @@
     if (m_rareData) {
         m_rareData->m_exceptionHandlers.shrinkToFit();
-        m_rareData->m_regexps.shrinkToFit();
         m_rareData->m_immediateSwitchJumpTables.shrinkToFit();
         m_rareData->m_characterSwitchJumpTables.shrinkToFit();

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -459 +459 @@
         FunctionExecutable* functionExpr(int index) { return m_functionExprs[index].get(); }
 
-        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
 
@@ -557 +553 @@
             Vector<HandlerInfo> m_exceptionHandlers;
 
-            // Rare Constants
-            Vector<RefPtr<RegExp> > m_regexps;
-
             // Jump Tables
             Vector<SimpleJumpTable> m_immediateSwitchJumpTables;

trunk/JavaScriptCore/bytecode/Opcode.h

@@ -47 +47 @@
         macro(op_new_object, 2) \
         macro(op_new_array, 4) \
-        macro(op_new_regexp, 3) \
         macro(op_mov, 3) \
         \