<!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>[160109] 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/160109">160109</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 11:29:19 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Infer constant closure variables
https://bugs.webkit.org/show_bug.cgi?id=124630
Source/JavaScriptCore:
Reviewed by Geoffrey Garen.
Captured variables that are assigned once (not counting op_enter's Undefined
initialization) and that are contained within a function that has thus far only been
entered once are now constant folded. It's pretty awesome.
This involves a watchpoint on the assignment to variables and a watchpoint on entry
into the function. The former is reused from global variable constant inference and the
latter is reused from one-time closure inference.
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):
* bytecode/Instruction.h:
(JSC::Instruction::Instruction):
* bytecode/Opcode.h:
(JSC::padOpcodeName):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedInstruction::UnlinkedInstruction):
* bytecode/VariableWatchpointSet.h:
(JSC::VariableWatchpointSet::invalidate):
* bytecode/Watchpoint.h:
(JSC::WatchpointSet::invalidate):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::addVar):
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitInitLazyRegister):
(JSC::BytecodeGenerator::emitMove):
(JSC::BytecodeGenerator::emitNewFunctionInternal):
(JSC::BytecodeGenerator::createArgumentsIfNecessary):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::addVar):
(JSC::BytecodeGenerator::watchableVariable):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::getLocal):
(JSC::DFG::ByteCodeParser::inferredConstant):
(JSC::DFG::ByteCodeParser::parseBlock):
(JSC::DFG::ByteCodeParser::parse):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::tryGetActivation):
(JSC::DFG::Graph::tryGetRegisters):
* dfg/DFGGraph.h:
* jit/JIT.cpp:
(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_mov):
(JSC::JIT::emit_op_captured_mov):
(JSC::JIT::emit_op_new_captured_func):
(JSC::JIT::emitSlow_op_captured_mov):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_mov):
(JSC::JIT::emit_op_captured_mov):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/CommonSlowPaths.h:
* runtime/ConstantMode.h: Added.
* runtime/JSGlobalObject.h:
* runtime/JSScope.cpp:
(JSC::abstractAccess):
* runtime/SymbolTable.cpp:
(JSC::SymbolTableEntry::prepareToWatch):
LayoutTests:
Reviewed by Geoffrey Garen.
This adds both correctness and performance tests for constant closure variable
inference.
* js/regress/infer-closure-const-then-mov-expected.txt: Added.
* js/regress/infer-closure-const-then-mov-no-inline-expected.txt: Added.
* js/regress/infer-closure-const-then-mov-no-inline.html: Added.
* js/regress/infer-closure-const-then-mov.html: Added.
* js/regress/infer-closure-const-then-put-to-scope-expected.txt: Added.
* js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt: Added.
* js/regress/infer-closure-const-then-put-to-scope-no-inline.html: Added.
* js/regress/infer-closure-const-then-put-to-scope.html: Added.
* js/regress/infer-closure-const-then-reenter-expected.txt: Added.
* js/regress/infer-closure-const-then-reenter-no-inline-expected.txt: Added.
* js/regress/infer-closure-const-then-reenter-no-inline.html: Added.
* js/regress/infer-closure-const-then-reenter.html: Added.
* js/regress/script-tests/infer-closure-const-then-mov-no-inline.js: Added.
* js/regress/script-tests/infer-closure-const-then-mov.js: Added.
* js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js: Added.
(thingy.):
(thingy):
* js/regress/script-tests/infer-closure-const-then-put-to-scope.js: Added.
(thingy.):
(thingy):
* js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js: Added.
(.return.foo):
(foo):
* js/regress/script-tests/infer-closure-const-then-reenter.js: Added.
(.return.foo):
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefilelistam">trunk/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInstructionh">trunk/Source/JavaScriptCore/bytecode/Instruction.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeOpcodeh">trunk/Source/JavaScriptCore/bytecode/Opcode.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeVariableWatchpointSeth">trunk/Source/JavaScriptCore/bytecode/VariableWatchpointSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeWatchpointh">trunk/Source/JavaScriptCore/bytecode/Watchpoint.h</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="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</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="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.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>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopecpp">trunk/Source/JavaScriptCore/runtime/JSScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSymbolTablecpp">trunk/Source/JavaScriptCore/runtime/SymbolTable.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenmovexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-mov-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenmovnoinlineexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenmovnoinlinehtml">trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline.html</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenmovhtml">trunk/LayoutTests/js/regress/infer-closure-const-then-mov.html</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenputtoscopeexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenputtoscopenoinlineexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenputtoscopenoinlinehtml">trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline.html</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenputtoscopehtml">trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope.html</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenreenterexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenreenternoinlineexpectedtxt">trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenreenternoinlinehtml">trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline.html</a></li>
<li><a href="#trunkLayoutTestsjsregressinferclosureconstthenreenterhtml">trunk/LayoutTests/js/regress/infer-closure-const-then-reenter.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenmovnoinlinejs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov-no-inline.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenmovjs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenputtoscopenoinlinejs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenputtoscopejs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenreenternoinlinejs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsinferclosureconstthenreenterjs">trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConstantModeh">trunk/Source/JavaScriptCore/runtime/ConstantMode.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/LayoutTests/ChangeLog 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2013-12-03 Filip Pizlo <fpizlo@apple.com>
+
+ Infer constant closure variables
+ https://bugs.webkit.org/show_bug.cgi?id=124630
+
+ Reviewed by Geoffrey Garen.
+
+ This adds both correctness and performance tests for constant closure variable
+ inference.
+
+ * js/regress/infer-closure-const-then-mov-expected.txt: Added.
+ * js/regress/infer-closure-const-then-mov-no-inline-expected.txt: Added.
+ * js/regress/infer-closure-const-then-mov-no-inline.html: Added.
+ * js/regress/infer-closure-const-then-mov.html: Added.
+ * js/regress/infer-closure-const-then-put-to-scope-expected.txt: Added.
+ * js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt: Added.
+ * js/regress/infer-closure-const-then-put-to-scope-no-inline.html: Added.
+ * js/regress/infer-closure-const-then-put-to-scope.html: Added.
+ * js/regress/infer-closure-const-then-reenter-expected.txt: Added.
+ * js/regress/infer-closure-const-then-reenter-no-inline-expected.txt: Added.
+ * js/regress/infer-closure-const-then-reenter-no-inline.html: Added.
+ * js/regress/infer-closure-const-then-reenter.html: Added.
+ * js/regress/script-tests/infer-closure-const-then-mov-no-inline.js: Added.
+ * js/regress/script-tests/infer-closure-const-then-mov.js: Added.
+ * js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js: Added.
+ (thingy.):
+ (thingy):
+ * js/regress/script-tests/infer-closure-const-then-put-to-scope.js: Added.
+ (thingy.):
+ (thingy):
+ * js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js: Added.
+ (.return.foo):
+ (foo):
+ * js/regress/script-tests/infer-closure-const-then-reenter.js: Added.
+ (.return.foo):
+ (foo):
+
</ins><span class="cx"> 2013-12-04 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK gardening. Updated expectations for GTK and share them with EFL.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenmovexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-mov-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-mov-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-mov-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-mov
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenmovnoinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-mov-no-inline
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenmovnoinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-mov-no-inline.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-mov-no-inline.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenmovhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-mov.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-mov.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-mov.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-mov.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenputtoscopeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-put-to-scope
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenputtoscopenoinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-put-to-scope-no-inline
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenputtoscopenoinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope-no-inline.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-put-to-scope-no-inline.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenputtoscopehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-put-to-scope.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-put-to-scope.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenreenterexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-reenter
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenreenternoinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline-expected.txt (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline-expected.txt 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/infer-closure-const-then-reenter-no-inline
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenreenternoinlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-reenter-no-inline.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-reenter-no-inline.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressinferclosureconstthenreenterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/infer-closure-const-then-reenter.html (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/infer-closure-const-then-reenter.html (rev 0)
+++ trunk/LayoutTests/js/regress/infer-closure-const-then-reenter.html 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/infer-closure-const-then-reenter.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenmovnoinlinejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov-no-inline.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov-no-inline.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov-no-inline.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+(function(){
+ var a = 42;
+ var b = 23;
+ var c = 84;
+ var d = 13;
+ var e = 90;
+ var f = 34;
+ var g = 52;
+
+ function foo() {
+ return a + b + c + d + e + f + g;
+ }
+
+ noInline(foo);
+
+ for (var i = 0; i < 500000; ++i) {
+ var result = foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+ }
+
+ a = 1;
+ b = 2;
+ c = 3;
+ d = 4;
+ e = 5;
+ f = 6;
+ g = 7;
+
+ var result = foo();
+ if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
+})();
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenmovjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-mov.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+(function(){
+ var a = 42;
+ var b = 23;
+ var c = 84;
+ var d = 13;
+ var e = 90;
+ var f = 34;
+ var g = 52;
+
+ function foo() {
+ return a + b + c + d + e + f + g;
+ }
+
+ for (var i = 0; i < 10000000; ++i) {
+ var result = foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+ }
+
+ a = 1;
+ b = 2;
+ c = 3;
+ d = 4;
+ e = 5;
+ f = 6;
+ g = 7;
+
+ var result = foo();
+ if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
+})();
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenputtoscopenoinlinejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope-no-inline.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+var thingy = (function(){
+ var a = 42;
+ var b = 23;
+ var c = 84;
+ var d = 13;
+ var e = 90;
+ var f = 34;
+ var g = 52;
+ return {
+ foo: function() {
+ return a + b + c + d + e + f + g;
+ },
+ bar: function() {
+ a = 1;
+ b = 2;
+ c = 3;
+ d = 4;
+ e = 5;
+ f = 6;
+ g = 7;
+ }
+ };
+})();
+
+noInline(thingy.foo);
+
+for (var i = 0; i < 2000000; ++i) {
+ var result = thingy.foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+}
+
+thingy.bar();
+var result = thingy.foo();
+if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenputtoscopejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-put-to-scope.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+var thingy = (function(){
+ var a = 42;
+ var b = 23;
+ var c = 84;
+ var d = 13;
+ var e = 90;
+ var f = 34;
+ var g = 52;
+ return {
+ foo: function() {
+ return a + b + c + d + e + f + g;
+ },
+ bar: function() {
+ a = 1;
+ b = 2;
+ c = 3;
+ d = 4;
+ e = 5;
+ f = 6;
+ g = 7;
+ }
+ };
+})();
+
+for (var i = 0; i < 10000000; ++i) {
+ var result = thingy.foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+}
+
+thingy.bar();
+var result = thingy.foo();
+if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenreenternoinlinejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter-no-inline.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+function foo(a_, b_, c_, d_, e_, f_, g_) {
+ var a = a_;
+ var b = b_;
+ var c = c_;
+ var d = d_;
+ var e = e_;
+ var f = f_;
+ var g = g_;
+ return {
+ foo: function() {
+ return a + b + c + d + e + f + g;
+ }
+ };
+}
+
+noInline(foo);
+
+var thingy = foo(42, 23, 84, 13, 90, 34, 52);
+noInline(thingy.foo);
+for (var i = 0; i < 10000000; ++i) {
+ var result = thingy.foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo(1, 2, 3, 4, 5, 6, 7).foo();
+if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsinferclosureconstthenreenterjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter.js (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/infer-closure-const-then-reenter.js 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+function foo(a_, b_, c_, d_, e_, f_, g_) {
+ var a = a_;
+ var b = b_;
+ var c = c_;
+ var d = d_;
+ var e = e_;
+ var f = f_;
+ var g = g_;
+ return {
+ foo: function() {
+ return a + b + c + d + e + f + g;
+ }
+ };
+}
+
+var thingy = foo(42, 23, 84, 13, 90, 34, 52);
+for (var i = 0; i < 10000000; ++i) {
+ var result = thingy.foo();
+ if (result != 42 + 23 + 84 + 13 + 90 + 34 + 52)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo(1, 2, 3, 4, 5, 6, 7).foo();
+if (result != 1 + 2 + 3 + 4 + 5 + 6 + 7)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -1,3 +1,77 @@
</span><ins>+2013-12-03 Filip Pizlo <fpizlo@apple.com>
+
+ Infer constant closure variables
+ https://bugs.webkit.org/show_bug.cgi?id=124630
+
+ Reviewed by Geoffrey Garen.
+
+ Captured variables that are assigned once (not counting op_enter's Undefined
+ initialization) and that are contained within a function that has thus far only been
+ entered once are now constant folded. It's pretty awesome.
+
+ This involves a watchpoint on the assignment to variables and a watchpoint on entry
+ into the function. The former is reused from global variable constant inference and the
+ latter is reused from one-time closure inference.
+
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ (JSC::CodeBlock::CodeBlock):
+ * bytecode/Instruction.h:
+ (JSC::Instruction::Instruction):
+ * bytecode/Opcode.h:
+ (JSC::padOpcodeName):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedInstruction::UnlinkedInstruction):
+ * bytecode/VariableWatchpointSet.h:
+ (JSC::VariableWatchpointSet::invalidate):
+ * bytecode/Watchpoint.h:
+ (JSC::WatchpointSet::invalidate):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::addVar):
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::emitInitLazyRegister):
+ (JSC::BytecodeGenerator::emitMove):
+ (JSC::BytecodeGenerator::emitNewFunctionInternal):
+ (JSC::BytecodeGenerator::createArgumentsIfNecessary):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::addVar):
+ (JSC::BytecodeGenerator::watchableVariable):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::getLocal):
+ (JSC::DFG::ByteCodeParser::inferredConstant):
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ (JSC::DFG::ByteCodeParser::parse):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::tryGetActivation):
+ (JSC::DFG::Graph::tryGetRegisters):
+ * dfg/DFGGraph.h:
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileMainPass):
+ (JSC::JIT::privateCompileSlowCases):
+ * jit/JIT.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_mov):
+ (JSC::JIT::emit_op_captured_mov):
+ (JSC::JIT::emit_op_new_captured_func):
+ (JSC::JIT::emitSlow_op_captured_mov):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_mov):
+ (JSC::JIT::emit_op_captured_mov):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/CommonSlowPaths.h:
+ * runtime/ConstantMode.h: Added.
+ * runtime/JSGlobalObject.h:
+ * runtime/JSScope.cpp:
+ (JSC::abstractAccess):
+ * runtime/SymbolTable.cpp:
+ (JSC::SymbolTableEntry::prepareToWatch):
+
</ins><span class="cx"> 2013-12-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed project file gardening.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.list.am (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.list.am 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/GNUmakefile.list.am 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -822,6 +822,7 @@
</span><span class="cx"> Source/JavaScriptCore/runtime/Completion.cpp \
</span><span class="cx"> Source/JavaScriptCore/runtime/Completion.h \
</span><span class="cx"> Source/JavaScriptCore/runtime/ConcurrentJITLock.h \
</span><ins>+ Source/JavaScriptCore/runtime/ConstantMode.h \
</ins><span class="cx"> Source/JavaScriptCore/runtime/ConstructData.cpp \
</span><span class="cx"> Source/JavaScriptCore/runtime/ConstructData.h \
</span><span class="cx"> Source/JavaScriptCore/runtime/DataView.cpp \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -1113,6 +1113,7 @@
</span><span class="cx"> <ClInclude Include="..\runtime\CommonSlowPathsExceptions.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\CompilationResult.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\Completion.h" />
</span><ins>+ <ClInclude Include="..\runtime\ConstantMode.h" />
</ins><span class="cx"> <ClInclude Include="..\runtime\ConstructData.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\DataView.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\DateConstructor.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -541,6 +541,7 @@
</span><span class="cx"> 0FFB921E16D02F470055A5DB /* DFGVariadicFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F85A31E16AB76AE0077571E /* DFGVariadicFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FFB921F16D033050055A5DB /* (null) in Headers */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FFB922016D033B70055A5DB /* NodeConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = 930DAD030FB1EB1A0082D205 /* NodeConstructors.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0FFC99D1184EC8AD009C10AB /* ConstantMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FFC99D0184EC8AD009C10AB /* ConstantMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FFFC95714EF90A000C72532 /* DFGCFAPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FFFC94B14EF909500C72532 /* DFGCFAPhase.cpp */; };
</span><span class="cx"> 0FFFC95814EF90A200C72532 /* DFGCFAPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FFFC94C14EF909500C72532 /* DFGCFAPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FFFC95914EF90A600C72532 /* DFGCSEPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FFFC94D14EF909500C72532 /* DFGCSEPhase.cpp */; };
</span><span class="lines">@@ -1845,6 +1846,7 @@
</span><span class="cx"> 0FF729A1166AD347000F5BA3 /* ProfilerOriginStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProfilerOriginStack.cpp; path = profiler/ProfilerOriginStack.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FF729A2166AD347000F5BA3 /* ProfilerOriginStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfilerOriginStack.h; path = profiler/ProfilerOriginStack.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FF922CF14F46B130041A24E /* JSCLLIntOffsetsExtractor */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = JSCLLIntOffsetsExtractor; sourceTree = BUILT_PRODUCTS_DIR; };
</span><ins>+ 0FFC99D0184EC8AD009C10AB /* ConstantMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConstantMode.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FFFC94B14EF909500C72532 /* DFGCFAPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGCFAPhase.cpp; path = dfg/DFGCFAPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FFFC94C14EF909500C72532 /* DFGCFAPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGCFAPhase.h; path = dfg/DFGCFAPhase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FFFC94D14EF909500C72532 /* DFGCSEPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGCSEPhase.cpp; path = dfg/DFGCSEPhase.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3404,6 +3406,7 @@
</span><span class="cx"> 969A09220ED1E09C00F1F681 /* Completion.cpp */,
</span><span class="cx"> F5BB2BC5030F772101FCFE1D /* Completion.h */,
</span><span class="cx"> 0FDB2CE9174896C7007B3C1B /* ConcurrentJITLock.h */,
</span><ins>+ 0FFC99D0184EC8AD009C10AB /* ConstantMode.h */,
</ins><span class="cx"> BCA62DFF0E2826310004F30D /* ConstructData.cpp */,
</span><span class="cx"> BC8F3CCF0DAF17BA00577A80 /* ConstructData.h */,
</span><span class="cx"> 0F2B66B017B6B5AB00A7AE3F /* DataView.cpp */,
</span><span class="lines">@@ -4418,6 +4421,7 @@
</span><span class="cx"> 0FD82E57141DAF1000179C94 /* DFGOSREntry.h in Headers */,
</span><span class="cx"> 0FD8A32617D51F5700CA2C40 /* DFGOSREntrypointCreationPhase.h in Headers */,
</span><span class="cx"> 0FC0976A1468A6F700CF2442 /* DFGOSRExit.h in Headers */,
</span><ins>+ 0FFC99D1184EC8AD009C10AB /* ConstantMode.h in Headers */,
</ins><span class="cx"> 0F235BEC17178E7300690C7F /* DFGOSRExitBase.h in Headers */,
</span><span class="cx"> A5BA15ED182340B400A82E69 /* RemoteInspectorXPCConnection.h in Headers */,
</span><span class="cx"> 0FFB921C16D02F110055A5DB /* DFGOSRExitCompilationInfo.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -768,6 +768,7 @@
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "captured_mov");
</span><span class="cx"> out.printf("%s, %s", registerName(r0).data(), registerName(r1).data());
</span><ins>+ ++it;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_not: {
</span><span class="lines">@@ -1224,9 +1225,9 @@
</span><span class="cx"> case op_new_captured_func: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><del>- int shouldCheck = (++it)->u.operand;
</del><span class="cx"> printLocationAndOp(out, exec, location, it, "new_captured_func");
</span><del>- out.printf("%s, f%d, %s", registerName(r0).data(), f0, shouldCheck ? "<Checked>" : "<Unchecked>");
</del><ins>+ out.printf("%s, f%d", registerName(r0).data(), f0);
+ ++it;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_func_exp: {
</span><span class="lines">@@ -1551,10 +1552,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_heap->isDeferred());
</span><span class="cx">
</span><ins>+ bool didCloneSymbolTable = false;
+
</ins><span class="cx"> if (SymbolTable* symbolTable = unlinkedCodeBlock->symbolTable()) {
</span><del>- if (codeType() == FunctionCode && symbolTable->captureCount())
</del><ins>+ if (codeType() == FunctionCode && symbolTable->captureCount()) {
</ins><span class="cx"> m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable->clone(*m_vm));
</span><del>- else
</del><ins>+ didCloneSymbolTable = true;
+ } else
</ins><span class="cx"> m_symbolTable.set(*m_vm, m_ownerExecutable.get(), symbolTable);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1820,11 +1824,28 @@
</span><span class="cx"> instructions[i + 4].u.operand = ResolveModeAndType(modeAndType.mode(), op.type).operand();
</span><span class="cx"> if (op.type == GlobalVar || op.type == GlobalVarWithVarInjectionChecks)
</span><span class="cx"> instructions[i + 5].u.watchpointSet = op.watchpointSet;
</span><del>- else if (op.structure)
</del><ins>+ else if (op.type == ClosureVar || op.type == ClosureVarWithVarInjectionChecks) {
+ if (op.watchpointSet)
+ op.watchpointSet->invalidate();
+ } else if (op.structure)
</ins><span class="cx"> instructions[i + 5].u.structure.set(*vm(), ownerExecutable, op.structure);
</span><span class="cx"> instructions[i + 6].u.pointer = reinterpret_cast<void*>(op.operand);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ case op_captured_mov:
+ case op_new_captured_func: {
+ StringImpl* uid = pc[i + 3].u.uid;
+ if (!uid)
+ break;
+ 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();
+ instructions[i + 3].u.watchpointSet = iter->value.watchpointSet();
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInstructionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Instruction.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Instruction.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/Instruction.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -90,16 +90,13 @@
</span><span class="cx"> Instruction(PropertySlot::GetValueFunc getterFunc) { u.getterFunc = getterFunc; }
</span><span class="cx">
</span><span class="cx"> Instruction(LLIntCallLinkInfo* callLinkInfo) { u.callLinkInfo = callLinkInfo; }
</span><del>-
</del><span class="cx"> Instruction(ValueProfile* profile) { u.profile = profile; }
</span><span class="cx"> Instruction(ArrayProfile* profile) { u.arrayProfile = profile; }
</span><span class="cx"> Instruction(ArrayAllocationProfile* profile) { u.arrayAllocationProfile = profile; }
</span><span class="cx"> Instruction(ObjectAllocationProfile* profile) { u.objectAllocationProfile = profile; }
</span><del>-
</del><span class="cx"> Instruction(WriteBarrier<Unknown>* registerPointer) { u.registerPointer = registerPointer; }
</span><del>-
</del><span class="cx"> Instruction(Special::Pointer pointer) { u.specialPointer = pointer; }
</span><del>-
</del><ins>+ Instruction(StringImpl* uid) { u.uid = uid; }
</ins><span class="cx"> Instruction(bool* predicatePointer) { u.predicatePointer = predicatePointer; }
</span><span class="cx">
</span><span class="cx"> union {
</span><span class="lines">@@ -112,6 +109,7 @@
</span><span class="cx"> Special::Pointer specialPointer;
</span><span class="cx"> PropertySlot::GetValueFunc getterFunc;
</span><span class="cx"> LLIntCallLinkInfo* callLinkInfo;
</span><ins>+ StringImpl* uid;
</ins><span class="cx"> ValueProfile* profile;
</span><span class="cx"> ArrayProfile* arrayProfile;
</span><span class="cx"> ArrayAllocationProfile* arrayAllocationProfile;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeOpcodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Opcode.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Opcode.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/Opcode.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> macro(op_new_array_buffer, 5) \
</span><span class="cx"> macro(op_new_regexp, 3) \
</span><span class="cx"> macro(op_mov, 3) \
</span><del>- macro(op_captured_mov, 3) \
</del><ins>+ macro(op_captured_mov, 4) \
</ins><span class="cx"> \
</span><span class="cx"> macro(op_not, 3) \
</span><span class="cx"> macro(op_eq, 4) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -229,9 +229,11 @@
</span><span class="cx"> UnlinkedInstruction() { u.operand = 0; }
</span><span class="cx"> UnlinkedInstruction(OpcodeID opcode) { u.opcode = opcode; }
</span><span class="cx"> UnlinkedInstruction(int operand) { u.operand = operand; }
</span><ins>+ UnlinkedInstruction(StringImpl* uid) { u.uid = uid; }
</ins><span class="cx"> union {
</span><span class="cx"> OpcodeID opcode;
</span><span class="cx"> int32_t operand;
</span><ins>+ StringImpl* uid;
</ins><span class="cx"> } u;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeVariableWatchpointSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/VariableWatchpointSet.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/VariableWatchpointSet.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/VariableWatchpointSet.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -80,10 +80,8 @@
</span><span class="cx">
</span><span class="cx"> void invalidate()
</span><span class="cx"> {
</span><del>- ASSERT(!!m_inferredValue);
- ASSERT(state() == IsWatched);
</del><span class="cx"> m_inferredValue = JSValue();
</span><del>- fireAll();
</del><ins>+ WatchpointSet::invalidate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void finalizeUnconditionally()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeWatchpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Watchpoint.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecode/Watchpoint.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -115,6 +115,13 @@
</span><span class="cx"> else
</span><span class="cx"> fireAll();
</span><span class="cx"> }
</span><ins>+
+ void invalidate()
+ {
+ if (state() == IsWatched)
+ fireAll();
+ m_state = IsInvalidated;
+ }
</ins><span class="cx">
</span><span class="cx"> int8_t* addressOfState() { return &m_state; }
</span><span class="cx"> int8_t* addressOfSetIsNotEmpty() { return &m_setIsNotEmpty; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -115,19 +115,31 @@
</span><span class="cx"> return ParserError(ParserError::ErrorNone);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool BytecodeGenerator::addVar(const Identifier& ident, bool isConstant, RegisterID*& r0)
</del><ins>+bool BytecodeGenerator::addVar(
+ const Identifier& ident, ConstantMode constantMode, WatchMode watchMode, RegisterID*& r0)
</ins><span class="cx"> {
</span><ins>+ ASSERT(static_cast<size_t>(m_codeBlock->m_numVars) == m_calleeRegisters.size());
+
</ins><span class="cx"> ConcurrentJITLocker locker(symbolTable().m_lock);
</span><span class="cx"> int index = virtualRegisterForLocal(m_calleeRegisters.size()).offset();
</span><del>- SymbolTableEntry newEntry(index, isConstant ? ReadOnly : 0);
</del><ins>+ SymbolTableEntry newEntry(index, constantMode == IsConstant ? ReadOnly : 0);
</ins><span class="cx"> SymbolTable::Map::AddResult result = symbolTable().add(locker, ident.impl(), newEntry);
</span><span class="cx">
</span><span class="cx"> if (!result.isNewEntry) {
</span><span class="cx"> r0 = &registerFor(result.iterator->value.getIndex());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ if (watchMode == IsWatchable) {
+ while (m_watchableVariables.size() < static_cast<size_t>(m_codeBlock->m_numVars))
+ m_watchableVariables.append(nullptr);
+ m_watchableVariables.append(ident.impl());
+ }
+
</ins><span class="cx"> r0 = addVar();
</span><ins>+
+ ASSERT(watchMode == NotWatchable || static_cast<size_t>(m_codeBlock->m_numVars) == m_watchableVariables.size());
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,7 +248,7 @@
</span><span class="cx">
</span><span class="cx"> if (functionBody->usesArguments() || codeBlock->usesEval()) { // May reify arguments object.
</span><span class="cx"> RegisterID* unmodifiedArgumentsRegister = addVar(); // Anonymous, so it can't be modified by user code.
</span><del>- RegisterID* argumentsRegister = addVar(propertyNames().arguments, false); // Can be changed by assigning to 'arguments'.
</del><ins>+ RegisterID* argumentsRegister = addVar(propertyNames().arguments, IsVariable, NotWatchable); // Can be changed by assigning to 'arguments'.
</ins><span class="cx">
</span><span class="cx"> // We can save a little space by hard-coding the knowledge that the two
</span><span class="cx"> // 'arguments' values are stored in consecutive registers, and storing
</span><span class="lines">@@ -307,13 +319,13 @@
</span><span class="cx"> instructions().append(m_activationRegister->index());
</span><span class="cx"> }
</span><span class="cx"> m_functions.add(ident.impl());
</span><del>- emitNewFunction(addVar(ident, false), IsCaptured, function);
</del><ins>+ emitNewFunction(addVar(ident, IsVariable, IsWatchable), IsCaptured, function);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> for (size_t i = 0; i < varStack.size(); ++i) {
</span><span class="cx"> const Identifier& ident = varStack[i].first;
</span><span class="cx"> if (functionBody->captures(ident))
</span><del>- addVar(ident, varStack[i].second & DeclarationStacks::IsConstant);
</del><ins>+ addVar(ident, (varStack[i].second & DeclarationStacks::IsConstant) ? IsConstant : IsVariable, IsWatchable);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> bool canLazilyCreateFunctions = !functionBody->needsActivationForMoreThanVariables() && !m_shouldEmitDebugHooks;
</span><span class="lines">@@ -331,7 +343,7 @@
</span><span class="cx"> const Identifier& ident = function->ident();
</span><span class="cx"> if (!functionBody->captures(ident)) {
</span><span class="cx"> m_functions.add(ident.impl());
</span><del>- RefPtr<RegisterID> reg = addVar(ident, false);
</del><ins>+ RefPtr<RegisterID> reg = addVar(ident, IsVariable, NotWatchable);
</ins><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><span class="lines">@@ -346,7 +358,7 @@
</span><span class="cx"> for (size_t i = 0; i < varStack.size(); ++i) {
</span><span class="cx"> const Identifier& ident = varStack[i].first;
</span><span class="cx"> if (!functionBody->captures(ident))
</span><del>- addVar(ident, varStack[i].second & DeclarationStacks::IsConstant);
</del><ins>+ addVar(ident, (varStack[i].second & DeclarationStacks::IsConstant) ? IsConstant : IsVariable, NotWatchable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldCaptureAllTheThings)
</span><span class="lines">@@ -457,6 +469,7 @@
</span><span class="cx"> {
</span><span class="cx"> emitOpcode(op_init_lazy_reg);
</span><span class="cx"> instructions().append(reg->index());
</span><ins>+ ASSERT(!watchableVariable(reg->index()));
</ins><span class="cx"> return reg;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1007,6 +1020,8 @@
</span><span class="cx"> emitOpcode(captureMode == IsCaptured ? op_captured_mov : op_mov);
</span><span class="cx"> instructions().append(dst->index());
</span><span class="cx"> instructions().append(src->index());
</span><ins>+ if (captureMode == IsCaptured)
+ instructions().append(watchableVariable(dst->index()));
</ins><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1579,7 +1594,11 @@
</span><span class="cx"> emitOpcode(captureMode == IsCaptured ? op_new_captured_func : op_new_func);
</span><span class="cx"> instructions().append(dst->index());
</span><span class="cx"> instructions().append(index);
</span><del>- instructions().append(doNullCheck);
</del><ins>+ if (captureMode == IsCaptured) {
+ ASSERT(!doNullCheck);
+ instructions().append(watchableVariable(dst->index()));
+ } else
+ instructions().append(doNullCheck);
</ins><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1621,6 +1640,7 @@
</span><span class="cx">
</span><span class="cx"> emitOpcode(op_create_arguments);
</span><span class="cx"> instructions().append(m_codeBlock->argumentsRegister().offset());
</span><ins>+ ASSERT(!watchableVariable(m_codeBlock->argumentsRegister().offset()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::createActivationIfNecessary()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -497,15 +497,16 @@
</span><span class="cx"> RegisterID* newRegister();
</span><span class="cx">
</span><span class="cx"> // Adds a var slot and maps it to the name ident in symbolTable().
</span><del>- RegisterID* addVar(const Identifier& ident, bool isConstant)
</del><ins>+ enum WatchMode { IsWatchable, NotWatchable };
+ RegisterID* addVar(const Identifier& ident, ConstantMode constantMode, WatchMode watchMode)
</ins><span class="cx"> {
</span><span class="cx"> RegisterID* local;
</span><del>- addVar(ident, isConstant, local);
</del><ins>+ addVar(ident, constantMode, watchMode, local);
</ins><span class="cx"> return local;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ditto. Returns true if a new RegisterID was added, false if a pre-existing RegisterID was re-used.
</span><del>- bool addVar(const Identifier&, bool isConstant, RegisterID*&);
</del><ins>+ bool addVar(const Identifier&, ConstantMode, WatchMode, RegisterID*&);
</ins><span class="cx">
</span><span class="cx"> // Adds an anonymous var slot. To give this slot a name, add it to symbolTable().
</span><span class="cx"> RegisterID* addVar()
</span><span class="lines">@@ -590,6 +591,16 @@
</span><span class="cx"> void createActivationIfNecessary();
</span><span class="cx"> RegisterID* createLazyRegisterIfNecessary(RegisterID*);
</span><span class="cx">
</span><ins>+ StringImpl* watchableVariable(int operand)
+ {
+ VirtualRegister reg(operand);
+ if (!reg.isLocal())
+ return 0;
+ if (static_cast<size_t>(reg.toLocal()) >= m_watchableVariables.size())
+ return 0;
+ return m_watchableVariables[reg.toLocal()];
+ }
+
</ins><span class="cx"> Vector<UnlinkedInstruction, 0, UnsafeVectorOverflow> m_instructions;
</span><span class="cx">
</span><span class="cx"> bool m_shouldEmitDebugHooks;
</span><span class="lines">@@ -609,6 +620,7 @@
</span><span class="cx"> RegisterID* m_activationRegister;
</span><span class="cx"> RegisterID* m_emptyValueRegister;
</span><span class="cx"> RegisterID* m_globalObjectRegister;
</span><ins>+ Vector<StringImpl*, 16> m_watchableVariables;
</ins><span class="cx"> SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_calleeRegisters;
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_parameters;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -263,6 +263,24 @@
</span><span class="cx"> Node* getLocal(VirtualRegister operand)
</span><span class="cx"> {
</span><span class="cx"> unsigned local = operand.toLocal();
</span><ins>+
+ if (local < m_localWatchpoints.size()) {
+ if (VariableWatchpointSet* set = m_localWatchpoints[local]) {
+ if (JSValue value = set->inferredValue()) {
+ addToGraph(FunctionReentryWatchpoint, OpInfo(m_codeBlock->symbolTable()));
+ addToGraph(VariableWatchpoint, OpInfo(set));
+ // Note: this is very special from an OSR exit standpoint. We wouldn't be
+ // able to do this for most locals, but it works here because we're dealing
+ // with a flushed local. For most locals we would need to issue a GetLocal
+ // here and ensure that we have uses in DFG IR wherever there would have
+ // been uses in bytecode. Clearly this optimization does not do this. But
+ // that's fine, because we don't need to track liveness for captured
+ // locals, and this optimization only kicks in for captured locals.
+ return inferredConstant(value);
+ }
+ }
+ }
+
</ins><span class="cx"> Node* node = m_currentBlock->variablesAtTail.local(local);
</span><span class="cx"> bool isCaptured = m_codeBlock->isCaptured(operand, inlineCallFrame());
</span><span class="cx">
</span><span class="lines">@@ -684,6 +702,13 @@
</span><span class="cx"> return result.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Node* inferredConstant(JSValue value)
+ {
+ if (value.isCell())
+ return cellConstant(value.asCell());
+ return getJSConstantForValue(value, 0);
+ }
+
</ins><span class="cx"> InlineCallFrame* inlineCallFrame()
</span><span class="cx"> {
</span><span class="cx"> return m_inlineStackTop->m_inlineCallFrame;
</span><span class="lines">@@ -1000,6 +1025,8 @@
</span><span class="cx">
</span><span class="cx"> HashMap<ConstantBufferKey, unsigned> m_constantBufferCache;
</span><span class="cx">
</span><ins>+ Vector<VariableWatchpointSet*, 16> m_localWatchpoints;
+
</ins><span class="cx"> struct InlineStackEntry {
</span><span class="cx"> ByteCodeParser* m_byteCodeParser;
</span><span class="cx">
</span><span class="lines">@@ -2145,12 +2172,21 @@
</span><span class="cx"> addToGraph(Breakpoint);
</span><span class="cx"> NEXT_OPCODE(op_debug);
</span><span class="cx"> #endif
</span><del>- case op_mov:
- case op_captured_mov: {
</del><ins>+ case op_mov: {
</ins><span class="cx"> Node* op = get(VirtualRegister(currentInstruction[2].u.operand));
</span><span class="cx"> set(VirtualRegister(currentInstruction[1].u.operand), op);
</span><span class="cx"> NEXT_OPCODE(op_mov);
</span><span class="cx"> }
</span><ins>+
+ case op_captured_mov: {
+ Node* op = get(VirtualRegister(currentInstruction[2].u.operand));
+ if (VariableWatchpointSet* set = currentInstruction[3].u.watchpointSet) {
+ if (set->state() != IsInvalidated)
+ addToGraph(NotifyWrite, OpInfo(set), op);
+ }
+ set(VirtualRegister(currentInstruction[1].u.operand), op);
+ NEXT_OPCODE(op_captured_mov);
+ }
</ins><span class="cx">
</span><span class="cx"> case op_check_has_instance:
</span><span class="cx"> addToGraph(CheckHasInstance, get(VirtualRegister(currentInstruction[3].u.operand)));
</span><span class="lines">@@ -3026,7 +3062,7 @@
</span><span class="cx">
</span><span class="cx"> case op_get_from_scope: {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><del>- unsigned scope = currentInstruction[2].u.operand;
</del><ins>+ int scope = currentInstruction[2].u.operand;
</ins><span class="cx"> unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[3].u.operand];
</span><span class="cx"> StringImpl* uid = m_graph.identifiers()[identifierNumber];
</span><span class="cx"> ResolveType resolveType = ResolveModeAndType(currentInstruction[4].u.operand).type();
</span><span class="lines">@@ -3077,15 +3113,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addToGraph(VariableWatchpoint, OpInfo(watchpointSet));
</span><del>- if (specificValue.isCell())
- set(VirtualRegister(dst), cellConstant(specificValue.asCell()));
- else
- set(VirtualRegister(dst), getJSConstantForValue(specificValue, 0));
</del><ins>+ set(VirtualRegister(dst), inferredConstant(specificValue));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ClosureVar:
</span><span class="cx"> case ClosureVarWithVarInjectionChecks: {
</span><span class="cx"> Node* scopeNode = get(VirtualRegister(scope));
</span><ins>+ if (JSActivation* activation = m_graph.tryGetActivation(scopeNode)) {
+ SymbolTable* symbolTable = activation->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ SymbolTable::Map::iterator iter = symbolTable->find(locker, uid);
+ ASSERT(iter != symbolTable->end(locker));
+ VariableWatchpointSet* watchpointSet = iter->value.watchpointSet();
+ if (watchpointSet) {
+ if (JSValue value = watchpointSet->inferredValue()) {
+ addToGraph(Phantom, scopeNode);
+ addToGraph(VariableWatchpoint, OpInfo(watchpointSet));
+ set(VirtualRegister(dst), inferredConstant(value));
+ break;
+ }
+ }
+ }
</ins><span class="cx"> set(VirtualRegister(dst),
</span><span class="cx"> addToGraph(GetClosureVar, OpInfo(operand), OpInfo(prediction),
</span><span class="cx"> addToGraph(GetClosureRegisters, scopeNode)));
</span><span class="lines">@@ -3226,8 +3274,7 @@
</span><span class="cx"> NEXT_OPCODE(op_get_argument_by_val);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case op_new_func:
- case op_new_captured_func: {
</del><ins>+ case op_new_func: {
</ins><span class="cx"> if (!currentInstruction[3].u.operand) {
</span><span class="cx"> set(VirtualRegister(currentInstruction[1].u.operand),
</span><span class="cx"> addToGraph(NewFunctionNoCheck, OpInfo(currentInstruction[2].u.operand)));
</span><span class="lines">@@ -3241,6 +3288,15 @@
</span><span class="cx"> NEXT_OPCODE(op_new_func);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ 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);
+ }
+
</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 class="lines">@@ -3610,6 +3666,22 @@
</span><span class="cx"> // Set during construction.
</span><span class="cx"> ASSERT(!m_currentIndex);
</span><span class="cx">
</span><ins>+ if (m_codeBlock->captureCount()) {
+ SymbolTable* symbolTable = m_codeBlock->symbolTable();
+ ConcurrentJITLocker locker(symbolTable->m_lock);
+ SymbolTable::Map::iterator iter = symbolTable->begin(locker);
+ SymbolTable::Map::iterator end = symbolTable->end(locker);
+ for (; iter != end; ++iter) {
+ VariableWatchpointSet* set = iter->value.watchpointSet();
+ if (!set)
+ continue;
+ size_t index = static_cast<size_t>(VirtualRegister(iter->value.getIndex()).toLocal());
+ while (m_localWatchpoints.size() <= index)
+ m_localWatchpoints.append(nullptr);
+ m_localWatchpoints[index] = set;
+ }
+ }
+
</ins><span class="cx"> InlineStackEntry inlineStackEntry(
</span><span class="cx"> this, m_codeBlock, m_profiledBlock, 0, 0, VirtualRegister(), VirtualRegister(),
</span><span class="cx"> m_codeBlock->numParameters(), CodeForCall);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -723,11 +723,16 @@
</span><span class="cx"> return std::max(frameRegisterCount(), requiredRegisterCountForExit());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WriteBarrierBase<Unknown>* Graph::tryGetRegisters(Node* node)
</del><ins>+JSActivation* Graph::tryGetActivation(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node->hasConstant())
</span><span class="cx"> return 0;
</span><del>- JSActivation* activation = jsDynamicCast<JSActivation*>(valueOfJSConstant(node));
</del><ins>+ return jsDynamicCast<JSActivation*>(valueOfJSConstant(node));
+}
+
+WriteBarrierBase<Unknown>* Graph::tryGetRegisters(Node* node)
+{
+ JSActivation* activation = tryGetActivation(node);
</ins><span class="cx"> if (!activation)
</span><span class="cx"> return 0;
</span><span class="cx"> if (!activation->isTornOff())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -791,6 +791,7 @@
</span><span class="cx"> unsigned requiredRegisterCountForExit();
</span><span class="cx"> unsigned requiredRegisterCountForExecutionAndExit();
</span><span class="cx">
</span><ins>+ JSActivation* tryGetActivation(Node*);
</ins><span class="cx"> WriteBarrierBase<Unknown>* tryGetRegisters(Node*);
</span><span class="cx">
</span><span class="cx"> VM& m_vm;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> DEFINE_OP(op_loop_hint)
</span><span class="cx"> DEFINE_OP(op_lshift)
</span><span class="cx"> DEFINE_OP(op_mod)
</span><del>- case op_captured_mov:
</del><ins>+ DEFINE_OP(op_captured_mov)
</ins><span class="cx"> DEFINE_OP(op_mov)
</span><span class="cx"> DEFINE_OP(op_mul)
</span><span class="cx"> DEFINE_OP(op_negate)
</span><span class="lines">@@ -235,8 +235,8 @@
</span><span class="cx"> DEFINE_OP(op_new_array)
</span><span class="cx"> DEFINE_OP(op_new_array_with_size)
</span><span class="cx"> DEFINE_OP(op_new_array_buffer)
</span><del>- case op_new_captured_func:
</del><span class="cx"> DEFINE_OP(op_new_func)
</span><ins>+ DEFINE_OP(op_new_captured_func)
</ins><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 class="lines">@@ -369,6 +369,7 @@
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_construct)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_to_this)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_create_this)
</span><ins>+ DEFINE_SLOWCASE_OP(op_captured_mov)
</ins><span class="cx"> DEFINE_SLOWCASE_OP(op_div)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_eq)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_get_callee)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -463,6 +463,7 @@
</span><span class="cx"> void emit_op_call(Instruction*);
</span><span class="cx"> void emit_op_call_eval(Instruction*);
</span><span class="cx"> void emit_op_call_varargs(Instruction*);
</span><ins>+ void emit_op_captured_mov(Instruction*);
</ins><span class="cx"> void emit_op_catch(Instruction*);
</span><span class="cx"> void emit_op_construct(Instruction*);
</span><span class="cx"> void emit_op_get_callee(Instruction*);
</span><span class="lines">@@ -515,6 +516,7 @@
</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><ins>+ void emit_op_new_captured_func(Instruction*);
</ins><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 class="lines">@@ -559,6 +561,7 @@
</span><span class="cx"> void emitSlow_op_call(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span><span class="cx"> void emitSlow_op_call_eval(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span><span class="cx"> void emitSlow_op_call_varargs(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span><ins>+ void emitSlow_op_captured_mov(Instruction*, Vector<SlowCaseEntry>::iterator&);
</ins><span class="cx"> void emitSlow_op_construct(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span><span class="cx"> void emitSlow_op_to_this(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span><span class="cx"> void emitSlow_op_create_this(Instruction*, Vector<SlowCaseEntry>::iterator&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -55,12 +55,20 @@
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><span class="cx"> int src = currentInstruction[2].u.operand;
</span><span class="cx">
</span><del>- // Use simpler approach, since the DFG thinks that the last result register
- // is always set to the destination on every operation.
</del><span class="cx"> emitGetVirtualRegister(src, regT0);
</span><span class="cx"> emitPutVirtualRegister(dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JIT::emit_op_captured_mov(Instruction* currentInstruction)
+{
+ int dst = currentInstruction[1].u.operand;
+ int src = currentInstruction[2].u.operand;
+
+ emitGetVirtualRegister(src, regT0);
+ emitNotifyWrite(regT0, regT1, currentInstruction[3].u.watchpointSet);
+ emitPutVirtualRegister(dst);
+}
+
</ins><span class="cx"> void JIT::emit_op_end(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(returnValueGPR != callFrameRegister);
</span><span class="lines">@@ -1171,6 +1179,12 @@
</span><span class="cx"> lazyJump.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JIT::emit_op_new_captured_func(Instruction* currentInstruction)
+{
+ JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_new_captured_func);
+ slowPathCall.call();
+}
+
</ins><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 class="lines">@@ -1212,6 +1226,16 @@
</span><span class="cx"> callOperation(operationNewArrayBufferWithProfile, dst, currentInstruction[4].u.arrayAllocationProfile, values, size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JIT::emitSlow_op_captured_mov(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
+{
+ VariableWatchpointSet* set = currentInstruction[3].u.watchpointSet;
+ if (!set || set->state() == IsInvalidated)
+ return;
+ linkSlowCase(iter);
+ JITSlowPathCall slowPathCall(this, currentInstruction, slow_path_captured_mov);
+ slowPathCall.call();
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> {
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><span class="cx"> int src = currentInstruction[2].u.operand;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_codeBlock->isConstantRegisterIndex(src))
</span><span class="cx"> emitStore(dst, getConstantOperand(src));
</span><span class="cx"> else {
</span><span class="lines">@@ -161,6 +161,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void JIT::emit_op_captured_mov(Instruction* currentInstruction)
+{
+ int dst = currentInstruction[1].u.operand;
+ int src = currentInstruction[2].u.operand;
+
+ emitLoad(src, regT1, regT0);
+ emitNotifyWrite(regT1, regT0, regT2, currentInstruction[3].u.watchpointSet);
+ emitStore(dst, regT1, regT0);
+}
+
</ins><span class="cx"> void JIT::emit_op_end(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(returnValueGPR != callFrameRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -670,16 +670,45 @@
</span><span class="cx"> dispatch(3)
</span><span class="cx">
</span><span class="cx">
</span><ins>+macro notifyWrite(set, valueTag, valuePayload, scratch, slow)
+ loadb VariableWatchpointSet::m_state[set], scratch
+ bieq scratch, IsInvalidated, .done
+ bineq scratch, ClearWatchpoint, .overwrite
+ storei valueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set]
+ storei valuePayload, VariableWatchpointSet::m_inferredValue + PayloadOffset[set]
+ storeb IsWatched, VariableWatchpointSet::m_state[set]
+ jmp .done
+
+.overwrite:
+ bineq valuePayload, VariableWatchpointSet::m_inferredValue + PayloadOffset[set], .definitelyDifferent
+ bieq valueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set], .done
+.definitelyDifferent:
+ btbnz VariableWatchpointSet::m_setIsNotEmpty[set], slow
+ storei EmptyValueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set]
+ storei 0, VariableWatchpointSet::m_inferredValue + PayloadOffset[set]
+ storeb IsInvalidated, VariableWatchpointSet::m_state[set]
+
+.done:
+end
+
</ins><span class="cx"> _llint_op_captured_mov:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t1
</span><ins>+ loadConstantOrVariable(t1, t2, t3)
+ loadpFromInstruction(3, t0)
+ btpz t0, .opCapturedMovReady
+ notifyWrite(t0, t2, t3, t1, .opCapturedMovSlow)
+.opCapturedMovReady:
</ins><span class="cx"> loadi 4[PC], t0
</span><del>- loadConstantOrVariable(t1, t2, t3)
</del><span class="cx"> storei t2, TagOffset[cfr, t0, 8]
</span><span class="cx"> storei t3, PayloadOffset[cfr, t0, 8]
</span><del>- dispatch(3)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><ins>+.opCapturedMovSlow:
+ callSlowPath(_slow_path_captured_mov)
+ dispatch(4)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> _llint_op_not:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t0
</span><span class="lines">@@ -1802,12 +1831,7 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_new_captured_func:
</span><span class="cx"> traceExecution()
</span><del>- btiz 12[PC], .opNewCapturedFuncUnchecked
- loadi 4[PC], t1
- bineq TagOffset[cfr, t1, 8], EmptyValueTag, .opNewCapturedFuncDone
-.opNewCapturedFuncUnchecked:
- callSlowPath(_llint_slow_path_new_func)
-.opNewCapturedFuncDone:
</del><ins>+ callSlowPath(_slow_path_new_captured_func)
</ins><span class="cx"> dispatch(4)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2281,27 +2305,6 @@
</span><span class="cx"> storePropertyAtVariableOffset(t1, t0, t2, t3)
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro notifyWrite(set, valueTag, valuePayload, scratch, slow)
- loadb VariableWatchpointSet::m_state[set], scratch
- bieq scratch, IsInvalidated, .done
- bineq scratch, ClearWatchpoint, .overwrite
- storei valueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set]
- storei valuePayload, VariableWatchpointSet::m_inferredValue + PayloadOffset[set]
- storeb IsWatched, VariableWatchpointSet::m_state[set]
- jmp .done
-
-.overwrite:
- bineq valuePayload, VariableWatchpointSet::m_inferredValue + PayloadOffset[set], .definitelyDifferent
- bieq valueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set], .done
-.definitelyDifferent:
- btbnz VariableWatchpointSet::m_setIsNotEmpty[set], slow
- storei EmptyValueTag, VariableWatchpointSet::m_inferredValue + TagOffset[set]
- storei 0, VariableWatchpointSet::m_inferredValue + PayloadOffset[set]
- storeb IsInvalidated, VariableWatchpointSet::m_state[set]
-
-.done:
-end
-
</del><span class="cx"> macro putGlobalVar()
</span><span class="cx"> loadisFromInstruction(3, t0)
</span><span class="cx"> loadConstantOrVariable(t0, t1, t2)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -502,15 +502,40 @@
</span><span class="cx"> dispatch(3)
</span><span class="cx">
</span><span class="cx">
</span><ins>+macro notifyWrite(set, value, scratch, slow)
+ loadb VariableWatchpointSet::m_state[set], scratch
+ bieq scratch, IsInvalidated, .done
+ bineq scratch, ClearWatchpoint, .overwrite
+ storeq value, VariableWatchpointSet::m_inferredValue[set]
+ storeb IsWatched, VariableWatchpointSet::m_state[set]
+ jmp .done
+
+.overwrite:
+ bqeq value, VariableWatchpointSet::m_inferredValue[set], .done
+ btbnz VariableWatchpointSet::m_setIsNotEmpty[set], slow
+ storeq 0, VariableWatchpointSet::m_inferredValue[set]
+ storeb IsInvalidated, VariableWatchpointSet::m_state[set]
+
+.done:
+end
+
</ins><span class="cx"> _llint_op_captured_mov:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t1)
</span><ins>+ loadConstantOrVariable(t1, t2)
+ loadpFromInstruction(3, t0)
+ btpz t0, .opCapturedMovReady
+ notifyWrite(t0, t2, t1, .opCapturedMovSlow)
+.opCapturedMovReady:
</ins><span class="cx"> loadisFromInstruction(1, t0)
</span><del>- loadConstantOrVariable(t1, t2)
</del><span class="cx"> storeq t2, [cfr, t0, 8]
</span><del>- dispatch(3)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><ins>+.opCapturedMovSlow:
+ callSlowPath(_slow_path_captured_mov)
+ dispatch(4)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> _llint_op_not:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t0)
</span><span class="lines">@@ -1609,13 +1634,7 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_new_captured_func:
</span><span class="cx"> traceExecution()
</span><del>- loadisFromInstruction(3, t2)
- btiz t2, .opNewCapturedFuncUnchecked
- loadisFromInstruction(1, t1)
- btqnz [cfr, t1, 8], .opNewCapturedFuncDone
-.opNewCapturedFuncUnchecked:
- callSlowPath(_llint_slow_path_new_func)
-.opNewCapturedFuncDone:
</del><ins>+ callSlowPath(_slow_path_new_captured_func)
</ins><span class="cx"> dispatch(4)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2057,23 +2076,6 @@
</span><span class="cx"> storePropertyAtVariableOffset(t1, t0, t2)
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro notifyWrite(set, value, scratch, slow)
- loadb VariableWatchpointSet::m_state[set], scratch
- bieq scratch, IsInvalidated, .done
- bineq scratch, ClearWatchpoint, .overwrite
- storeq value, VariableWatchpointSet::m_inferredValue[set]
- storeb IsWatched, VariableWatchpointSet::m_state[set]
- jmp .done
-
-.overwrite:
- bqeq value, VariableWatchpointSet::m_inferredValue[set], .done
- btbnz VariableWatchpointSet::m_setIsNotEmpty[set], slow
- storeq 0, VariableWatchpointSet::m_inferredValue[set]
- storeb IsInvalidated, VariableWatchpointSet::m_state[set]
-
-.done:
-end
-
</del><span class="cx"> macro putGlobalVar()
</span><span class="cx"> loadisFromInstruction(3, t0)
</span><span class="cx"> loadConstantOrVariable(t0, t1)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -244,6 +244,29 @@
</span><span class="cx"> RETURN(v1.toThis(exec, exec->codeBlock()->isStrictMode() ? StrictMode : NotStrictMode));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SLOW_PATH_DECL(slow_path_captured_mov)
+{
+ BEGIN();
+ JSValue value = OP_C(2).jsValue();
+ if (VariableWatchpointSet* set = pc[3].u.watchpointSet)
+ set->notifyWrite(value);
+ RETURN(value);
+}
+
+SLOW_PATH_DECL(slow_path_new_captured_func)
+{
+ BEGIN();
+ CodeBlock* codeBlock = exec->codeBlock();
+ ASSERT(
+ codeBlock->codeType() != FunctionCode
+ || !codeBlock->needsFullScopeChain()
+ || exec->uncheckedR(codeBlock->activationRegister().offset()).jsValue());
+ JSValue value = JSFunction::create(vm, codeBlock->functionDecl(pc[2].u.operand), exec->scope());
+ if (VariableWatchpointSet* set = pc[3].u.watchpointSet)
+ set->notifyWrite(value);
+ RETURN(value);
+}
+
</ins><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 (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -165,6 +165,8 @@
</span><span class="cx"> SLOW_PATH_HIDDEN_DECL(slow_path_create_this);
</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><ins>+SLOW_PATH_HIDDEN_DECL(slow_path_captured_mov);
+SLOW_PATH_HIDDEN_DECL(slow_path_new_captured_func);
</ins><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>
<a id="trunkSourceJavaScriptCoreruntimeConstantModeh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/ConstantMode.h (0 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConstantMode.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/ConstantMode.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ConstantMode_h
+#define ConstantMode_h
+
+namespace JSC {
+
+enum ConstantMode { IsConstant, IsVariable };
+
+} // namespace JSC
+
+#endif // ConstantMode_h
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #define JSGlobalObject_h
</span><span class="cx">
</span><span class="cx"> #include "ArrayAllocationProfile.h"
</span><ins>+#include "ConstantMode.h"
</ins><span class="cx"> #include "JSArray.h"
</span><span class="cx"> #include "JSArrayBufferPrototype.h"
</span><span class="cx"> #include "JSClassRef.h"
</span><span class="lines">@@ -295,7 +296,6 @@
</span><span class="cx"> init(thisValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- enum ConstantMode { IsConstant, IsVariable };
</del><span class="cx"> struct NewGlobalVar {
</span><span class="cx"> int registerNumber;
</span><span class="cx"> VariableWatchpointSet* set;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!entry.isNull()) {
</span><del>- op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, 0, activation, 0, entry.getIndex());
</del><ins>+ op = ResolveOp(makeType(ClosureVar, needsVarInjectionChecks), depth, 0, activation, entry.watchpointSet(), entry.getIndex());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSymbolTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SymbolTable.cpp (160108 => 160109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SymbolTable.cpp 2013-12-04 19:17:03 UTC (rev 160108)
+++ trunk/Source/JavaScriptCore/runtime/SymbolTable.cpp 2013-12-04 19:29:19 UTC (rev 160109)
</span><span class="lines">@@ -68,7 +68,8 @@
</span><span class="cx"> void SymbolTableEntry::prepareToWatch()
</span><span class="cx"> {
</span><span class="cx"> FatEntry* entry = inflate();
</span><del>- ASSERT(!entry->m_watchpoints);
</del><ins>+ if (entry->m_watchpoints)
+ return;
</ins><span class="cx"> entry->m_watchpoints = adoptRef(new VariableWatchpointSet());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>