<!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>[208830] 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/208830">208830</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 17:02:06 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>UnlinkedCodeBlock should not have a starting line number
https://bugs.webkit.org/show_bug.cgi?id=164838
Reviewed by Mark Lam.
Here's how the starting line number in UnlinkedCodeBlock used to work:
(1) Assign the source code starting line number to the parser starting
line number.
(2) Assign (1) to the AST.
(3) Subtract (1) from (2) and assign to UnlinkedCodeBlock.
Then, when linking:
(4) Add (3) to (1).
This was an awesome no-op.
Generally, unlinked code is code that is not tied to any particular
web page or resource. So, it's inappropriate to think of it having a
starting line number.
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedCodeBlock::recordParse):
(JSC::UnlinkedCodeBlock::hasCapturedVariables):
(JSC::UnlinkedCodeBlock::firstLine): Deleted.
* runtime/CodeCache.cpp:
(JSC::CodeCache::getUnlinkedGlobalCodeBlock):
* runtime/CodeCache.h:
(JSC::generateUnlinkedCodeBlock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCacheh">trunk/Source/JavaScriptCore/runtime/CodeCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208829 => 208830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-17 00:59:04 UTC (rev 208829)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-17 01:02:06 UTC (rev 208830)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-11-16 Geoffrey Garen <ggaren@apple.com>
+
+ UnlinkedCodeBlock should not have a starting line number
+ https://bugs.webkit.org/show_bug.cgi?id=164838
+
+ Reviewed by Mark Lam.
+
+ Here's how the starting line number in UnlinkedCodeBlock used to work:
+
+ (1) Assign the source code starting line number to the parser starting
+ line number.
+
+ (2) Assign (1) to the AST.
+
+ (3) Subtract (1) from (2) and assign to UnlinkedCodeBlock.
+
+ Then, when linking:
+
+ (4) Add (3) to (1).
+
+ This was an awesome no-op.
+
+ Generally, unlinked code is code that is not tied to any particular
+ web page or resource. So, it's inappropriate to think of it having a
+ starting line number.
+
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedCodeBlock::recordParse):
+ (JSC::UnlinkedCodeBlock::hasCapturedVariables):
+ (JSC::UnlinkedCodeBlock::firstLine): Deleted.
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getUnlinkedGlobalCodeBlock):
+ * runtime/CodeCache.h:
+ (JSC::generateUnlinkedCodeBlock):
+
</ins><span class="cx"> 2016-11-16 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6][WebCore] Change ES6_MODULES compile time flag to runtime flag
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (208829 => 208830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-11-17 00:59:04 UTC (rev 208829)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2016-11-17 01:02:06 UTC (rev 208830)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> , m_constructorKind(static_cast<unsigned>(info.constructorKind()))
</span><span class="cx"> , m_derivedContextType(static_cast<unsigned>(info.derivedContextType()))
</span><span class="cx"> , m_evalContextType(static_cast<unsigned>(info.evalContextType()))
</span><del>- , m_firstLine(0)
</del><span class="cx"> , m_lineCount(0)
</span><span class="cx"> , m_endColumn(UINT_MAX)
</span><span class="cx"> , m_didOptimize(MixedTriState)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (208829 => 208830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-11-17 00:59:04 UTC (rev 208829)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2016-11-17 01:02:06 UTC (rev 208830)
</span><span class="lines">@@ -347,11 +347,10 @@
</span><span class="cx">
</span><span class="cx"> bool typeProfilerExpressionInfoForBytecodeOffset(unsigned bytecodeOffset, unsigned& startDivot, unsigned& endDivot);
</span><span class="cx">
</span><del>- void recordParse(CodeFeatures features, bool hasCapturedVariables, unsigned firstLine, unsigned lineCount, unsigned endColumn)
</del><ins>+ void recordParse(CodeFeatures features, bool hasCapturedVariables, unsigned lineCount, unsigned endColumn)
</ins><span class="cx"> {
</span><span class="cx"> m_features = features;
</span><span class="cx"> m_hasCapturedVariables = hasCapturedVariables;
</span><del>- m_firstLine = firstLine;
</del><span class="cx"> m_lineCount = lineCount;
</span><span class="cx"> // For the UnlinkedCodeBlock, startColumn is always 0.
</span><span class="cx"> m_endColumn = endColumn;
</span><span class="lines">@@ -364,7 +363,6 @@
</span><span class="cx">
</span><span class="cx"> CodeFeatures codeFeatures() const { return m_features; }
</span><span class="cx"> bool hasCapturedVariables() const { return m_hasCapturedVariables; }
</span><del>- unsigned firstLine() const { return m_firstLine; }
</del><span class="cx"> unsigned lineCount() const { return m_lineCount; }
</span><span class="cx"> ALWAYS_INLINE unsigned startColumn() const { return 0; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -436,7 +434,6 @@
</span><span class="cx"> unsigned m_constructorKind : 2;
</span><span class="cx"> unsigned m_derivedContextType : 2;
</span><span class="cx"> unsigned m_evalContextType : 2;
</span><del>- unsigned m_firstLine;
</del><span class="cx"> unsigned m_lineCount;
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (208829 => 208830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2016-11-17 00:59:04 UTC (rev 208829)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2016-11-17 01:02:06 UTC (rev 208830)
</span><span class="lines">@@ -61,12 +61,11 @@
</span><span class="cx"> SourceCodeValue* cache = m_sourceCode.findCacheAndUpdateAge(key);
</span><span class="cx"> if (cache && Options::useCodeCache()) {
</span><span class="cx"> UnlinkedCodeBlockType* unlinkedCodeBlock = jsCast<UnlinkedCodeBlockType*>(cache->cell.get());
</span><del>- unsigned firstLine = source.firstLine() + unlinkedCodeBlock->firstLine();
</del><span class="cx"> unsigned lineCount = unlinkedCodeBlock->lineCount();
</span><span class="cx"> unsigned startColumn = unlinkedCodeBlock->startColumn() + source.startColumn();
</span><span class="cx"> bool endColumnIsOnStartLine = !lineCount;
</span><span class="cx"> unsigned endColumn = unlinkedCodeBlock->endColumn() + (endColumnIsOnStartLine ? startColumn : 1);
</span><del>- executable->recordParse(unlinkedCodeBlock->codeFeatures(), unlinkedCodeBlock->hasCapturedVariables(), firstLine, firstLine + lineCount, startColumn, endColumn);
</del><ins>+ executable->recordParse(unlinkedCodeBlock->codeFeatures(), unlinkedCodeBlock->hasCapturedVariables(), source.firstLine(), source.firstLine() + lineCount, startColumn, endColumn);
</ins><span class="cx"> source.provider()->setSourceURLDirective(unlinkedCodeBlock->sourceURLDirective());
</span><span class="cx"> source.provider()->setSourceMappingURLDirective(unlinkedCodeBlock->sourceMappingURLDirective());
</span><span class="cx"> return unlinkedCodeBlock;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.h (208829 => 208830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.h 2016-11-17 00:59:04 UTC (rev 208829)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.h 2016-11-17 01:02:06 UTC (rev 208830)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> executable->recordParse(rootNode->features() | arrowContextFeature, rootNode->hasCapturedVariables(), rootNode->firstLine(), rootNode->lastLine(), startColumn, endColumn);
</span><span class="cx">
</span><span class="cx"> UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(&vm, executable->executableInfo(), debuggerMode);
</span><del>- unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine() - source.firstLine(), lineCount, unlinkedEndColumn);
</del><ins>+ unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), lineCount, unlinkedEndColumn);
</ins><span class="cx"> unlinkedCodeBlock->setSourceURLDirective(source.provider()->sourceURL());
</span><span class="cx"> unlinkedCodeBlock->setSourceMappingURLDirective(source.provider()->sourceMappingURL());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>