Changeset 57955 in webkit for trunk/JavaScriptCore/bytecompiler

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/bytecompiler

Files:

• BytecodeGenerator.cpp (modified) (4 diffs)
• BytecodeGenerator.h (modified) (3 diffs)
• NodesCodegen.cpp (modified) (1 diff)

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -35 +35 @@
 #include "JSFunction.h"
 #include "Interpreter.h"
+#include "RegExp.h"
+#include "RegExpObject.h"
 #include "UString.h"
 
@@ -826 +828 @@
 
     return &m_constantPoolRegisters[index];
-}
-
-unsigned BytecodeGenerator::addRegExp(RegExp* r)
-{
-    return m_codeBlock->addRegExp(r);
 }
 
@@ -983 +980 @@
 }
 
+RegisterID* BytecodeGenerator::emitLoad(RegisterID* dst, RegExp* regExp)
+{
+    JSValue jsRegExp = new (globalData()) RegExpObject(m_scopeChain->globalObject()->regExpStructure(), regExp);
+    return emitLoad(dst, jsRegExp);
+}
+
 RegisterID* BytecodeGenerator::emitLoad(RegisterID* dst, JSValue v)
 {
@@ -1362 +1365 @@
 }
 
-RegisterID* BytecodeGenerator::emitNewRegExp(RegisterID* dst, RegExp* regExp)
-{
-    emitOpcode(op_new_regexp);
-    instructions().append(dst->index());
-    instructions().append(addRegExp(regExp));
-    return dst;
-}
-
-
 RegisterID* BytecodeGenerator::emitNewFunctionExpression(RegisterID* r0, FuncExprNode* n)
 {

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -265 +265 @@
         RegisterID* emitLoad(RegisterID* dst, double);
         RegisterID* emitLoad(RegisterID* dst, const Identifier&);
+        RegisterID* emitLoad(RegisterID* dst, RegExp* regExp);
         RegisterID* emitLoad(RegisterID* dst, JSValue);
 
@@ -277 +278 @@
         RegisterID* emitNewFunction(RegisterID* dst, FunctionBodyNode* body);
         RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
-        RegisterID* emitNewRegExp(RegisterID* dst, RegExp* regExp);
 
         RegisterID* emitMove(RegisterID* dst, RegisterID* src);
@@ -447 +447 @@
         unsigned addConstant(const Identifier&);
         RegisterID* addConstantValue(JSValue);
-        unsigned addRegExp(RegExp*);
 
         PassRefPtr<FunctionExecutable> makeFunction(ExecState* exec, FunctionBodyNode* body)

trunk/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -150 +150 @@
     if (dst == generator.ignoredResult())
         return 0;
-    return generator.emitNewRegExp(generator.finalDestination(dst), regExp.get());
+    return generator.emitLoad(generator.finalDestination(dst), regExp.get());
 }