<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204958] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204958">204958</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-25 00:04:00 -0700 (Thu, 25 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>NewRegexp should not prevent inlining
https://bugs.webkit.org/show_bug.cgi?id=154808
Patch by Caio Lima <ticaiolima@gmail.com> on 2016-08-25
Reviewed by Geoffrey Garen.
JSTests:
Added test where functions with NewRegExp can be inlined right now.
* stress/new-regex-inline.js: Added.
(assert):
(testRegexpInline):
(toInlineGlobal):
(withRegexp):
(inlineRegexpNotGlobal):
(toInlineRecursive):
(regexpContainsRecursive):
Source/JavaScriptCore:
In this patch we are changing the current mechanism used to represent
RegExp in NewRegexp nodes. We are changing the use of a index
pointing to RegExp in
CodeBlock->m_unlinkedCodeBlock->m_rareData->m_regexps as the operand of
NewRegexp node to RegExp address as the operand. To make sure that RegExp* is
pointing to a valid object, we are using m_graph.freezeStrong
mechanism.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGCapabilities.cpp:
(JSC::DFG::capabilityLevel):
* dfg/DFGNode.h:
(JSC::DFG::Node::hasCellOperand):
(JSC::DFG::Node::hasRegexpIndex): Deleted.
(JSC::DFG::Node::regexpIndex): Deleted.
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileNewRegexp):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressnewregexinlinejs">trunk/JSTests/stress/new-regex-inline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/JSTests/ChangeLog 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-08-25 Caio Lima <ticaiolima@gmail.com>
+
+ NewRegexp should not prevent inlining
+ https://bugs.webkit.org/show_bug.cgi?id=154808
+
+ Reviewed by Geoffrey Garen.
+
+ Added test where functions with NewRegExp can be inlined right now.
+
+ * stress/new-regex-inline.js: Added.
+ (assert):
+ (testRegexpInline):
+ (toInlineGlobal):
+ (withRegexp):
+ (inlineRegexpNotGlobal):
+ (toInlineRecursive):
+ (regexpContainsRecursive):
+
</ins><span class="cx"> 2016-08-24 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [JSC] Make FRound work with any type
</span></span></pre></div>
<a id="trunkJSTestsstressnewregexinlinejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/new-regex-inline.js (0 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/new-regex-inline.js (rev 0)
+++ trunk/JSTests/stress/new-regex-inline.js 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+function assert(a) {
+ if (!a)
+ throw Error("bad assertion");
+}
+
+function testRegexpInline(functor) {
+ for (let i = 0; i < 100000; i++) {
+ functor();
+ }
+
+ gc();
+
+ // Create objects to force collected objects be reused
+ for (let i = 0; i < 10000000; i++) {
+ let a = {value: i};
+ }
+
+ // Checking if RegExp were collected
+ for (let i = 0; i < 100; i++) {
+ functor();
+ }
+}
+
+function toInlineGlobal() {
+ var re = /cc+/;
+
+ assert(re.test("ccc"));
+ assert(!re.test("abc"));
+ return 0;
+}
+
+function withRegexp() {
+ toInlineGlobal();
+ var re = /(ab)+/;
+ assert(re.test("ab"));
+ assert(!re.test("ba"));
+ return 0;
+}
+
+noInline(withRegexp);
+
+testRegexpInline(withRegexp);
+
+function inlineRegexpNotGlobal() {
+ let toInline = () => {
+ let re = /a+/;
+
+ assert(re.test("aaaaaa"));
+ assert(!re.test("bc"));
+ }
+
+ toInline();
+}
+
+noInline(inlineRegexpNotGlobal);
+
+testRegexpInline(inlineRegexpNotGlobal);
+
+function toInlineRecursive(depth) {
+ if (depth == 5) {
+ return;
+ }
+
+ var re = /(ef)+/;
+
+ assert(re.test("efef"));
+ assert(!re.test("abc"));
+
+ toInlineRecursive(depth + 1);
+}
+
+function regexpContainsRecursive() {
+ var re = /r+/;
+ toInlineRecursive(0);
+
+ assert(re.test("r"));
+ assert(!re.test("ab"));
+}
+noInline(regexpContainsRecursive);
+
+testRegexpInline(regexpContainsRecursive);
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-08-25 Caio Lima <ticaiolima@gmail.com>
+
+ NewRegexp should not prevent inlining
+ https://bugs.webkit.org/show_bug.cgi?id=154808
+
+ Reviewed by Geoffrey Garen.
+
+ In this patch we are changing the current mechanism used to represent
+ RegExp in NewRegexp nodes. We are changing the use of a index
+ pointing to RegExp in
+ CodeBlock->m_unlinkedCodeBlock->m_rareData->m_regexps as the operand of
+ NewRegexp node to RegExp address as the operand. To make sure that RegExp* is
+ pointing to a valid object, we are using m_graph.freezeStrong
+ mechanism.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.cpp:
+ (JSC::DFG::capabilityLevel):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::hasCellOperand):
+ (JSC::DFG::Node::hasRegexpIndex): Deleted.
+ (JSC::DFG::Node::regexpIndex): Deleted.
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGStrengthReductionPhase.cpp:
+ (JSC::DFG::StrengthReductionPhase::handleNode):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileNewRegexp):
+
</ins><span class="cx"> 2016-08-24 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> [JSC] Make FRound work with any type
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -3698,10 +3698,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case op_new_regexp: {
</span><del>- // FIXME: We really should be able to inline code that uses NewRegexp. That means
- // using something other than the index into the CodeBlock here.
- // https://bugs.webkit.org/show_bug.cgi?id=154808
- set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(NewRegexp, OpInfo(currentInstruction[2].u.operand)));
</del><ins>+ RegExp* regexp = m_inlineStackTop->m_codeBlock->regexp(currentInstruction[2].u.operand);
+ FrozenValue* frozen = m_graph.freezeStrong(regexp);
+ set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(NewRegexp, OpInfo(frozen)));
</ins><span class="cx"> NEXT_OPCODE(op_new_regexp);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -245,9 +245,9 @@
</span><span class="cx"> case op_log_shadow_chicken_tail:
</span><span class="cx"> case op_put_to_scope:
</span><span class="cx"> case op_resolve_scope:
</span><ins>+ case op_new_regexp:
</ins><span class="cx"> return CanCompileAndInline;
</span><span class="cx">
</span><del>- case op_new_regexp:
</del><span class="cx"> case op_switch_string: // Don't inline because we don't want to copy string tables in the concurrent JIT.
</span><span class="cx"> case op_call_eval:
</span><span class="cx"> return CanCompile;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -1100,20 +1100,6 @@
</span><span class="cx"> m_opInfo = indexingType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: We really should be able to inline code that uses NewRegexp. That means
- // using something other than the index into the CodeBlock here.
- // https://bugs.webkit.org/show_bug.cgi?id=154808
- bool hasRegexpIndex()
- {
- return op() == NewRegexp;
- }
-
- unsigned regexpIndex()
- {
- ASSERT(hasRegexpIndex());
- return m_opInfo;
- }
-
</del><span class="cx"> bool hasScopeOffset()
</span><span class="cx"> {
</span><span class="cx"> return op() == GetClosureVar || op() == PutClosureVar;
</span><span class="lines">@@ -1468,6 +1454,7 @@
</span><span class="cx"> case NewGeneratorFunction:
</span><span class="cx"> case CreateActivation:
</span><span class="cx"> case MaterializeCreateActivation:
</span><ins>+ case NewRegexp:
</ins><span class="cx"> case CompareEqPtr:
</span><span class="cx"> return true;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -3984,7 +3984,8 @@
</span><span class="cx"> GPRFlushedCallResult resultPayload(this);
</span><span class="cx"> GPRFlushedCallResult2 resultTag(this);
</span><span class="cx">
</span><del>- callOperation(operationNewRegexp, JSValueRegs(resultTag.gpr(), resultPayload.gpr()), m_jit.codeBlock()->regexp(node->regexpIndex()));
</del><ins>+ RegExp* regexp = node->castOperand<RegExp*>();
+ callOperation(operationNewRegexp, JSValueRegs(resultTag.gpr(), resultPayload.gpr()), regexp);
</ins><span class="cx"> m_jit.exceptionCheck();
</span><span class="cx">
</span><span class="cx"> // FIXME: make the callOperation above explicitly return a cell result, or jitAssert the tag is a cell tag.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -3933,10 +3933,8 @@
</span><span class="cx"> flushRegisters();
</span><span class="cx"> GPRFlushedCallResult result(this);
</span><span class="cx">
</span><del>- // FIXME: We really should be able to inline code that uses NewRegexp. That means not
- // reaching into the CodeBlock here.
- // https://bugs.webkit.org/show_bug.cgi?id=154808
- callOperation(operationNewRegexp, result.gpr(), m_jit.codeBlock()->regexp(node->regexpIndex()));
</del><ins>+ RegExp* regexp = node->castOperand<RegExp*>();
+ callOperation(operationNewRegexp, result.gpr(), regexp);
</ins><span class="cx"> m_jit.exceptionCheck();
</span><span class="cx">
</span><span class="cx"> cellResult(result.gpr(), node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> if (RegExpObject* regExpObject = regExpObjectNode->dynamicCastConstant<RegExpObject*>())
</span><span class="cx"> regExp = regExpObject->regExp();
</span><span class="cx"> else if (regExpObjectNode->op() == NewRegexp)
</span><del>- regExp = codeBlock()->regexp(regExpObjectNode->regexpIndex());
</del><ins>+ regExp = regExpObjectNode->castOperand<RegExp*>();
</ins><span class="cx"> else {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Giving up because the regexp is unknown.\n");
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> if (RegExpObject* regExpObject = regExpObjectNode->dynamicCastConstant<RegExpObject*>())
</span><span class="cx"> regExp = regExpObject->regExp();
</span><span class="cx"> else if (regExpObjectNode->op() == NewRegexp)
</span><del>- regExp = codeBlock()->regexp(regExpObjectNode->regexpIndex());
</del><ins>+ regExp = regExpObjectNode->castOperand<RegExp*>();
</ins><span class="cx"> else {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Giving up because the regexp is unknown.\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (204957 => 204958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-08-25 06:51:04 UTC (rev 204957)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-08-25 07:04:00 UTC (rev 204958)
</span><span class="lines">@@ -7339,14 +7339,11 @@
</span><span class="cx">
</span><span class="cx"> void compileNewRegexp()
</span><span class="cx"> {
</span><del>- // FIXME: We really should be able to inline code that uses NewRegexp. That means not
- // reaching into the CodeBlock here.
- // https://bugs.webkit.org/show_bug.cgi?id=154808
-
</del><ins>+ RegExp* regexp = m_node->castOperand<RegExp*>();
</ins><span class="cx"> LValue result = vmCall(
</span><span class="cx"> pointerType(),
</span><span class="cx"> m_out.operation(operationNewRegexp), m_callFrame,
</span><del>- m_out.constIntPtr(codeBlock()->regexp(m_node->regexpIndex())));
</del><ins>+ m_out.constIntPtr(regexp));
</ins><span class="cx">
</span><span class="cx"> setJSValue(result);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>