<!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>[174401] trunk/Source/JavaScriptCore</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/174401">174401</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-10-07 11:57:57 -0700 (Tue, 07 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove op_new_captured_func
https://bugs.webkit.org/show_bug.cgi?id=137491
Reviewed by Mark Lam.
Removes the op_captured_new_func opcode as part of the work
towards having any magical opcodes that write directly to
named "registers" and then have a follow on op to ensure that
the environment record correctly represents the stack state.
For this we add a non-captured scratch register so we don't
have to have any kind of magic opcode, and instead simply
have sensible creation and move semantics for capturing new
functions.
* bytecode/BytecodeList.json:
* bytecode/BytecodeUseDef.h:
(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitNewFunction):
(JSC::BytecodeGenerator::emitLazyNewFunction):
(JSC::BytecodeGenerator::emitNewFunctionInternal):
* bytecompiler/BytecodeGenerator.h:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGCapabilities.cpp:
(JSC::DFG::capabilityLevel):
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_new_captured_func): Deleted.
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL): Deleted.
* runtime/CommonSlowPaths.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeUseDefh">trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</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="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsh">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-10-07 Oliver Hunt <oliver@apple.com>
+
+ Remove op_new_captured_func
+ https://bugs.webkit.org/show_bug.cgi?id=137491
+
+ Reviewed by Mark Lam.
+
+ Removes the op_captured_new_func opcode as part of the work
+ towards having any magical opcodes that write directly to
+ named "registers" and then have a follow on op to ensure that
+ the environment record correctly represents the stack state.
+
+ For this we add a non-captured scratch register so we don't
+ have to have any kind of magic opcode, and instead simply
+ have sensible creation and move semantics for capturing new
+ functions.
+
+ * bytecode/BytecodeList.json:
+ * bytecode/BytecodeUseDef.h:
+ (JSC::computeUsesForBytecodeOffset):
+ (JSC::computeDefsForBytecodeOffset):
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ (JSC::CodeBlock::CodeBlock):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::emitNewFunction):
+ (JSC::BytecodeGenerator::emitLazyNewFunction):
+ (JSC::BytecodeGenerator::emitNewFunctionInternal):
+ * bytecompiler/BytecodeGenerator.h:
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.cpp:
+ (JSC::DFG::capabilityLevel):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileMainPass):
+ * jit/JIT.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_new_captured_func): Deleted.
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL): Deleted.
+ * runtime/CommonSlowPaths.h:
+
</ins><span class="cx"> 2014-10-06 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Objective-C objects must be fully defined when used in a WTF::Vector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> { "name" : "op_switch_char", "length" : 4 },
</span><span class="cx"> { "name" : "op_switch_string", "length" : 4 },
</span><span class="cx"> { "name" : "op_new_func", "length" : 4 },
</span><del>- { "name" : "op_new_captured_func", "length" : 4 },
</del><span class="cx"> { "name" : "op_new_func_exp", "length" : 3 },
</span><span class="cx"> { "name" : "op_call", "length" : 9 },
</span><span class="cx"> { "name" : "op_call_eval", "length" : 9 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> case op_touch_entry:
</span><span class="cx"> return;
</span><span class="cx"> case op_new_func:
</span><del>- case op_new_captured_func:
</del><span class="cx"> case op_create_lexical_environment:
</span><span class="cx"> case op_create_arguments:
</span><span class="cx"> case op_to_this:
</span><span class="lines">@@ -311,7 +310,6 @@
</span><span class="cx"> case op_new_array_with_size:
</span><span class="cx"> case op_new_regexp:
</span><span class="cx"> case op_new_func:
</span><del>- case op_new_captured_func:
</del><span class="cx"> case op_new_func_exp:
</span><span class="cx"> case op_call_varargs:
</span><span class="cx"> case op_construct_varargs:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -1270,14 +1270,6 @@
</span><span class="cx"> out.printf("%s, f%d, %s", registerName(r0).data(), f0, shouldCheck ? "<Checked>" : "<Unchecked>");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case op_new_captured_func: {
- int r0 = (++it)->u.operand;
- int f0 = (++it)->u.operand;
- printLocationAndOp(out, exec, location, it, "new_captured_func");
- out.printf("%s, f%d", registerName(r0).data(), f0);
- ++it;
- break;
- }
</del><span class="cx"> case op_new_func_exp: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><span class="lines">@@ -2105,21 +2097,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case op_new_captured_func: {
- if (pc[3].u.index == UINT_MAX) {
- instructions[i + 3].u.watchpointSet = 0;
- break;
- }
- StringImpl* uid = identifier(pc[3].u.index).impl();
- RELEASE_ASSERT(didCloneSymbolTable);
- ConcurrentJITLocker locker(m_symbolTable->m_lock);
- SymbolTable::Map::iterator iter = m_symbolTable->find(locker, uid);
- ASSERT(iter != m_symbolTable->end(locker));
- iter->value.prepareToWatch(symbolTable());
- instructions[i + 3].u.watchpointSet = iter->value.watchpointSet();
- break;
- }
-
</del><span class="cx"> case op_debug: {
</span><span class="cx"> if (pc[1].u.index == DidReachBreakpoint)
</span><span class="cx"> m_hasDebuggerStatement = true;
</span><span class="lines">@@ -3899,7 +3876,6 @@
</span><span class="cx"> case op_enter:
</span><span class="cx"> case op_init_lazy_reg:
</span><span class="cx"> case op_create_arguments:
</span><del>- case op_new_captured_func:
</del><span class="cx"> return;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> emitOpcode(op_create_lexical_environment);
</span><span class="cx"> instructions().append(m_lexicalEnvironmentRegister->index());
</span><span class="cx"> }
</span><del>-
</del><ins>+ RegisterID* scratch = addVar();
</ins><span class="cx"> m_symbolTable->setCaptureStart(virtualRegisterForLocal(m_codeBlock->m_numVars).offset());
</span><span class="cx">
</span><span class="cx"> if (functionBody->usesArguments() || codeBlock->usesEval()) { // May reify arguments object.
</span><span class="lines">@@ -332,10 +332,8 @@
</span><span class="cx"> const Identifier& ident = function->ident();
</span><span class="cx"> if (functionBody->captures(ident) || shouldCaptureAllTheThings) {
</span><span class="cx"> m_functions.add(ident.impl());
</span><del>- // We rely on still allocating stack space for captured variables
- // here.
- RegisterID* newFunction = emitNewFunction(addVar(ident, IsVariable, IsWatchable), IsCaptured, function);
- initializeCapturedVariable(newFunction, ident, newFunction);
</del><ins>+ emitNewFunction(scratch, function);
+ initializeCapturedVariable(addVar(ident, IsVariable, IsWatchable), ident, scratch);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> for (size_t i = 0; i < varStack.size(); ++i) {
</span><span class="lines">@@ -359,7 +357,7 @@
</span><span class="cx"> // Don't lazily create functions that override the name 'arguments'
</span><span class="cx"> // as this would complicate lazy instantiation of actual arguments.
</span><span class="cx"> if (!canLazilyCreateFunctions || ident == propertyNames().arguments)
</span><del>- emitNewFunction(reg.get(), NotCaptured, function);
</del><ins>+ emitNewFunction(reg.get(), function);
</ins><span class="cx"> else {
</span><span class="cx"> emitInitLazyRegister(reg.get());
</span><span class="cx"> m_lazyFunctions.set(reg->virtualRegister().toLocal(), function);
</span><span class="lines">@@ -1657,9 +1655,9 @@
</span><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RegisterID* BytecodeGenerator::emitNewFunction(RegisterID* dst, CaptureMode captureMode, FunctionBodyNode* function)
</del><ins>+RegisterID* BytecodeGenerator::emitNewFunction(RegisterID* dst, FunctionBodyNode* function)
</ins><span class="cx"> {
</span><del>- return emitNewFunctionInternal(dst, captureMode, m_codeBlock->addFunctionDecl(makeFunction(function)), false);
</del><ins>+ return emitNewFunctionInternal(dst, m_codeBlock->addFunctionDecl(makeFunction(function)), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* BytecodeGenerator::emitLazyNewFunction(RegisterID* dst, FunctionBodyNode* function)
</span><span class="lines">@@ -1667,19 +1665,15 @@
</span><span class="cx"> FunctionOffsetMap::AddResult ptr = m_functionOffsets.add(function, 0);
</span><span class="cx"> if (ptr.isNewEntry)
</span><span class="cx"> ptr.iterator->value = m_codeBlock->addFunctionDecl(makeFunction(function));
</span><del>- return emitNewFunctionInternal(dst, NotCaptured, ptr.iterator->value, true);
</del><ins>+ return emitNewFunctionInternal(dst, ptr.iterator->value, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RegisterID* BytecodeGenerator::emitNewFunctionInternal(RegisterID* dst, CaptureMode captureMode, unsigned index, bool doNullCheck)
</del><ins>+RegisterID* BytecodeGenerator::emitNewFunctionInternal(RegisterID* dst, unsigned index, bool doNullCheck)
</ins><span class="cx"> {
</span><del>- emitOpcode(captureMode == IsCaptured ? op_new_captured_func : op_new_func);
</del><ins>+ emitOpcode(op_new_func);
</ins><span class="cx"> instructions().append(dst->index());
</span><span class="cx"> instructions().append(index);
</span><del>- if (captureMode == IsCaptured) {
- ASSERT(!doNullCheck);
- instructions().append(watchableVariable(dst->index()));
- } else
- instructions().append(doNullCheck);
</del><ins>+ instructions().append(doNullCheck);
</ins><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -449,9 +449,9 @@
</span><span class="cx"> RegisterID* emitNewObject(RegisterID* dst);
</span><span class="cx"> RegisterID* emitNewArray(RegisterID* dst, ElementNode*, unsigned length); // stops at first elision
</span><span class="cx">
</span><del>- RegisterID* emitNewFunction(RegisterID* dst, CaptureMode, FunctionBodyNode*);
</del><ins>+ RegisterID* emitNewFunction(RegisterID* dst, FunctionBodyNode*);
</ins><span class="cx"> RegisterID* emitLazyNewFunction(RegisterID* dst, FunctionBodyNode* body);
</span><del>- RegisterID* emitNewFunctionInternal(RegisterID* dst, CaptureMode, unsigned index, bool shouldNullCheck);
</del><ins>+ RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index, bool shouldNullCheck);
</ins><span class="cx"> RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
</span><span class="cx"> RegisterID* emitNewRegExp(RegisterID* dst, RegExp*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -3439,16 +3439,7 @@
</span><span class="cx"> }
</span><span class="cx"> NEXT_OPCODE(op_new_func);
</span><span class="cx"> }
</span><del>-
- case op_new_captured_func: {
- Node* function = addToGraph(
- NewFunctionNoCheck, OpInfo(currentInstruction[2].u.operand));
- if (VariableWatchpointSet* set = currentInstruction[3].u.watchpointSet)
- addToGraph(NotifyWrite, OpInfo(set), function);
- set(VirtualRegister(currentInstruction[1].u.operand), function);
- NEXT_OPCODE(op_new_captured_func);
- }
-
</del><ins>+
</ins><span class="cx"> case op_new_func_exp: {
</span><span class="cx"> set(VirtualRegister(currentInstruction[1].u.operand),
</span><span class="cx"> addToGraph(NewFunctionExpression, OpInfo(currentInstruction[2].u.operand)));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -232,7 +232,6 @@
</span><span class="cx"> case op_new_regexp:
</span><span class="cx"> case op_create_lexical_environment:
</span><span class="cx"> case op_new_func:
</span><del>- case op_new_captured_func:
</del><span class="cx"> case op_new_func_exp:
</span><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"> return CanCompile;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -256,7 +256,6 @@
</span><span class="cx"> DEFINE_OP(op_new_array_with_size)
</span><span class="cx"> DEFINE_OP(op_new_array_buffer)
</span><span class="cx"> DEFINE_OP(op_new_func)
</span><del>- DEFINE_OP(op_new_captured_func)
</del><span class="cx"> DEFINE_OP(op_new_func_exp)
</span><span class="cx"> DEFINE_OP(op_new_object)
</span><span class="cx"> DEFINE_OP(op_new_regexp)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -514,7 +514,6 @@
</span><span class="cx"> void emit_op_new_array_with_size(Instruction*);
</span><span class="cx"> void emit_op_new_array_buffer(Instruction*);
</span><span class="cx"> void emit_op_new_func(Instruction*);
</span><del>- void emit_op_new_captured_func(Instruction*);
</del><span class="cx"> void emit_op_new_func_exp(Instruction*);
</span><span class="cx"> void emit_op_new_object(Instruction*);
</span><span class="cx"> void emit_op_new_regexp(Instruction*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -1035,12 +1035,6 @@
</span><span class="cx"> lazyJump.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emit_op_new_captured_func(Instruction* currentInstruction)
-{
- JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_new_captured_func);
- slowPathCall.call();
-}
-
</del><span class="cx"> void JIT::emit_op_new_func_exp(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -1909,13 +1909,6 @@
</span><span class="cx"> .opNewFuncDone:
</span><span class="cx"> dispatch(4)
</span><span class="cx">
</span><del>-
-_llint_op_new_captured_func:
- traceExecution()
- callSlowPath(_slow_path_new_captured_func)
- dispatch(4)
-
-
</del><span class="cx"> macro arrayProfileForCall()
</span><span class="cx"> loadi 16[PC], t3
</span><span class="cx"> negi t3
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -1769,13 +1769,6 @@
</span><span class="cx"> .opNewFuncDone:
</span><span class="cx"> dispatch(4)
</span><span class="cx">
</span><del>-
-_llint_op_new_captured_func:
- traceExecution()
- callSlowPath(_slow_path_new_captured_func)
- dispatch(4)
-
-
</del><span class="cx"> macro arrayProfileForCall()
</span><span class="cx"> loadisFromInstruction(4, t3)
</span><span class="cx"> negp t3
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -262,17 +262,6 @@
</span><span class="cx"> RETURN(v1.toThis(exec, exec->codeBlock()->isStrictMode() ? StrictMode : NotStrictMode));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SLOW_PATH_DECL(slow_path_new_captured_func)
-{
- BEGIN();
- CodeBlock* codeBlock = exec->codeBlock();
- ASSERT(codeBlock->codeType() != FunctionCode || !codeBlock->needsActivation() || exec->hasActivation());
- JSValue value = JSFunction::create(vm, codeBlock->functionDecl(pc[2].u.operand), exec->scope());
- if (VariableWatchpointSet* set = pc[3].u.watchpointSet)
- set->notifyWrite(vm, value, "Executed op_new_captured_func");
- RETURN(value);
-}
-
</del><span class="cx"> SLOW_PATH_DECL(slow_path_not)
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h (174400 => 174401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-10-07 18:41:49 UTC (rev 174400)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-10-07 18:57:57 UTC (rev 174401)
</span><span class="lines">@@ -190,7 +190,6 @@
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_enter);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_get_callee);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_to_this);
</span><del>-SLOW_PATH_HIDDEN_DECL(slow_path_new_captured_func);
</del><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_not);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_eq);
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_neq);
</span></span></pre>
</div>
</div>
</body>
</html>