<!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>[182294] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182294">182294</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-04-02 15:46:52 -0700 (Thu, 02 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Options::dumpSourceAtDFGTime().
<https://webkit.org/b/143349>
Reviewed by Oliver Hunt, and Michael Saboff.
Sometimes, we will want to see the JS source code that we're compiling, and it
would be nice to be able to do this without having to jump thru a lot of hoops.
So, let's add a Options::dumpSourceAtDFGTime() option just like we have a
Options::dumpBytecodeAtDFGTime() option.
Also added versions of CodeBlock::dumpSource() and CodeBlock::dumpBytecode()
that explicitly take no arguments (instead of relying on the version that takes
the default argument). These versions are friendlier to use when we want to call
them from an interactive debugging session.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpSource):
(JSC::CodeBlock::dumpBytecode):
* bytecode/CodeBlock.h:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseCodeBlock):
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182293 => 182294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-02 22:40:11 UTC (rev 182293)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-02 22:46:52 UTC (rev 182294)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-02 Mark Lam <mark.lam@apple.com>
+
+ Add Options::dumpSourceAtDFGTime().
+ <https://webkit.org/b/143349>
+
+ Reviewed by Oliver Hunt, and Michael Saboff.
+
+ Sometimes, we will want to see the JS source code that we're compiling, and it
+ would be nice to be able to do this without having to jump thru a lot of hoops.
+ So, let's add a Options::dumpSourceAtDFGTime() option just like we have a
+ Options::dumpBytecodeAtDFGTime() option.
+
+ Also added versions of CodeBlock::dumpSource() and CodeBlock::dumpBytecode()
+ that explicitly take no arguments (instead of relying on the version that takes
+ the default argument). These versions are friendlier to use when we want to call
+ them from an interactive debugging session.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpSource):
+ (JSC::CodeBlock::dumpBytecode):
+ * bytecode/CodeBlock.h:
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseCodeBlock):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2015-04-02 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Clean up EnumerationMode to easily extend
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (182293 => 182294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-04-02 22:40:11 UTC (rev 182293)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-04-02 22:46:52 UTC (rev 182294)
</span><span class="lines">@@ -552,6 +552,31 @@
</span><span class="cx"> it += 5;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CodeBlock::dumpSource()
+{
+ dumpSource(WTF::dataFile());
+}
+
+void CodeBlock::dumpSource(PrintStream& out)
+{
+ ScriptExecutable* executable = ownerExecutable();
+ if (executable->isFunctionExecutable()) {
+ FunctionExecutable* functionExecutable = reinterpret_cast<FunctionExecutable*>(executable);
+ String source = functionExecutable->source().provider()->getRange(
+ functionExecutable->parametersStartOffset(),
+ functionExecutable->typeProfilingEndOffset() + 1); // Type profiling end offset is the character before the '}'.
+
+ out.print("function ", inferredName(), source);
+ return;
+ }
+ out.print(executable->source().toString());
+}
+
+void CodeBlock::dumpBytecode()
+{
+ dumpBytecode(WTF::dataFile());
+}
+
</ins><span class="cx"> void CodeBlock::dumpBytecode(PrintStream& out)
</span><span class="cx"> {
</span><span class="cx"> // We only use the ExecState* for things that don't actually lead to JS execution,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (182293 => 182294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-04-02 22:40:11 UTC (rev 182293)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-04-02 22:46:52 UTC (rev 182294)
</span><span class="lines">@@ -155,7 +155,11 @@
</span><span class="cx">
</span><span class="cx"> void visitAggregate(SlotVisitor&);
</span><span class="cx">
</span><del>- void dumpBytecode(PrintStream& = WTF::dataFile());
</del><ins>+ void dumpSource();
+ void dumpSource(PrintStream&);
+
+ void dumpBytecode();
+ void dumpBytecode(PrintStream&);
</ins><span class="cx"> void dumpBytecode(
</span><span class="cx"> PrintStream&, unsigned bytecodeOffset,
</span><span class="cx"> const StubInfoMap& = StubInfoMap(), const CallLinkInfoMap& = CallLinkInfoMap());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (182293 => 182294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-04-02 22:40:11 UTC (rev 182293)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-04-02 22:46:52 UTC (rev 182294)
</span><span class="lines">@@ -3970,8 +3970,9 @@
</span><span class="cx"> *m_vm->m_perBytecodeProfiler, m_inlineStackTop->m_profiledBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool shouldDumpSource = Options::dumpSourceAtDFGTime();
</ins><span class="cx"> bool shouldDumpBytecode = Options::dumpBytecodeAtDFGTime();
</span><del>- if (shouldDumpBytecode) {
</del><ins>+ if (shouldDumpSource || shouldDumpBytecode) {
</ins><span class="cx"> dataLog("Parsing ", *codeBlock);
</span><span class="cx"> if (inlineCallFrame()) {
</span><span class="cx"> dataLog(
</span><span class="lines">@@ -3981,9 +3982,17 @@
</span><span class="cx"> dataLog(
</span><span class="cx"> ": needsActivation = ", codeBlock->needsActivation(),
</span><span class="cx"> ", isStrictMode = ", codeBlock->ownerExecutable()->isStrictMode(), "\n");
</span><del>- codeBlock->baselineVersion()->dumpBytecode();
</del><span class="cx"> }
</span><ins>+
+ if (shouldDumpSource) {
+ dataLog("==== begin source ====\n");
+ codeBlock->baselineVersion()->dumpSource();
+ dataLog("\n==== end source ====\n\n");
+ }
</ins><span class="cx">
</span><ins>+ if (shouldDumpBytecode)
+ codeBlock->baselineVersion()->dumpBytecode();
+
</ins><span class="cx"> Vector<unsigned, 32> jumpTargets;
</span><span class="cx"> computePreciseJumpTargets(codeBlock, jumpTargets);
</span><span class="cx"> if (Options::dumpBytecodeAtDFGTime()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (182293 => 182294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2015-04-02 22:40:11 UTC (rev 182293)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2015-04-02 22:46:52 UTC (rev 182294)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx"> v(bool, showAllDFGNodes, false) \
</span><span class="cx"> v(optionRange, bytecodeRangeToDFGCompile, 0) \
</span><span class="cx"> v(optionString, dfgFunctionWhitelistFile, nullptr) \
</span><ins>+ v(bool, dumpSourceAtDFGTime, false) \
</ins><span class="cx"> v(bool, dumpBytecodeAtDFGTime, false) \
</span><span class="cx"> v(bool, dumpGraphAfterParsing, false) \
</span><span class="cx"> v(bool, dumpGraphAtEachPhase, false) \
</span></span></pre>
</div>
</div>
</body>
</html>