<!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>[193115] branches/safari-601-branch/Source</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/193115">193115</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:48:13 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188549">r188549</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCorebytecodeCodeBlockcpp">branches/safari-601-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCorejsccpp">branches/safari-601-branch/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (193114 => 193115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-12-03 18:48:07 UTC (rev 193114)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-12-03 18:48:13 UTC (rev 193115)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188549. rdar://problem/23221163
+
+ 2015-08-17 Saam barati <sbarati@apple.com>
+
+ Web Inspector: Type profiler return types aren't showing up
+ https://bugs.webkit.org/show_bug.cgi?id=147348
+
+ Reviewed by Brian Burg.
+
+ Bug #145995 changed the starting offset of a function to
+ be the open parenthesis of the function's parameter list.
+ This broke JSC's type profiler protocol of communicating
+ return types of a function to the web inspector. This
+ is now fixed. The text offset used in the protocol is now
+ the first letter of the function/get/set/method name.
+ So "f" in "function a() {}", "s" in "set foo(){}", etc.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::CodeBlock):
+ * jsc.cpp:
+ (functionReturnTypeFor):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188403. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-13 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp (193114 => 193115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-12-03 18:48:07 UTC (rev 193114)
+++ branches/safari-601-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-12-03 18:48:13 UTC (rev 193115)
</span><span class="lines">@@ -2124,9 +2124,9 @@
</span><span class="cx"> // Because a return statement can be added implicitly to return undefined at the end of a function,
</span><span class="cx"> // and these nodes don't emit expression ranges because they aren't in the actual source text of
</span><span class="cx"> // the user's program, give the type profiler some range to identify these return statements.
</span><del>- // Currently, the text offset that is used as identification is on the open brace of the function
</del><ins>+ // Currently, the text offset that is used as identification is "f" in the function keyword
</ins><span class="cx"> // and is stored on TypeLocation's m_divotForFunctionOffsetIfReturnStatement member variable.
</span><del>- divotStart = divotEnd = m_sourceOffset;
</del><ins>+ divotStart = divotEnd = m_ownerExecutable->typeProfilingStartOffset();
</ins><span class="cx"> shouldAnalyze = true;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -2139,7 +2139,7 @@
</span><span class="cx"> bool isNewLocation = locationPair.second;
</span><span class="cx">
</span><span class="cx"> if (flag == ProfileTypeBytecodeFunctionReturnStatement)
</span><del>- location->m_divotForFunctionOffsetIfReturnStatement = m_sourceOffset;
</del><ins>+ location->m_divotForFunctionOffsetIfReturnStatement = m_ownerExecutable->typeProfilingStartOffset();
</ins><span class="cx">
</span><span class="cx"> if (shouldAnalyze && isNewLocation)
</span><span class="cx"> vm()->typeProfiler()->insertNewLocation(location);
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/jsc.cpp (193114 => 193115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/jsc.cpp 2015-12-03 18:48:07 UTC (rev 193114)
+++ branches/safari-601-branch/Source/JavaScriptCore/jsc.cpp 2015-12-03 18:48:13 UTC (rev 193115)
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx"> RELEASE_ASSERT(functionValue.isFunction());
</span><span class="cx"> FunctionExecutable* executable = (jsDynamicCast<JSFunction*>(functionValue.asCell()->getObject()))->jsExecutable();
</span><span class="cx">
</span><del>- unsigned offset = executable->source().startOffset();
</del><ins>+ unsigned offset = executable->typeProfilingStartOffset();
</ins><span class="cx"> String jsonString = exec->vm().typeProfiler()->typeInformationForExpressionAtOffset(TypeProfilerSearchDescriptorFunctionReturn, offset, executable->sourceID(), exec->vm());
</span><span class="cx"> return JSValue::encode(JSONParse(exec, jsonString));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193114 => 193115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:48:07 UTC (rev 193114)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:48:13 UTC (rev 193115)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188549. rdar://problem/23221163
+
+ 2015-08-17 Saam barati <sbarati@apple.com>
+
+ Web Inspector: Type profiler return types aren't showing up
+ https://bugs.webkit.org/show_bug.cgi?id=147348
+
+ Reviewed by Brian Burg.
+
+ Bug #145995 changed the starting offset of a function to
+ be the open parenthesis of the function's parameter list.
+ This broke the type profiler's text offset based protocol with JSC.
+ The text offset used in the protocol is now the first letter of the
+ function/get/set/method name. So "f" in "function a() {}", "s" in "set foo(){}", etc.
+
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ (WebInspector.ScriptSyntaxTree.prototype.containsNonEmptyReturnStatement):
+ (WebInspector.ScriptSyntaxTree.functionReturnDivot):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188546. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-17 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (193114 => 193115)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-12-03 18:48:07 UTC (rev 193114)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-12-03 18:48:13 UTC (rev 193115)
</span><span class="lines">@@ -146,6 +146,23 @@
</span><span class="cx"> return hasNonEmptyReturnStatement;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static functionReturnDivot(node)
+ {
+ console.assert(
+ node.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration
+ || node.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression
+ || node.type === WebInspector.ScriptSyntaxTree.NodeType.MethodDefinition);
+
+ // COMPATIBILITY (iOS 9): Legacy Backends view the return type as being the opening "{" of the function body.
+ // After iOS 9, this is to move to the start of the function statement/expression. See below:
+ // FIXME: Need a better way to determine backend versions. Using DOM.pseudoElement because that was added after iOS 9.
+ if (!DOMAgent.hasEvent("pseudoElementAdded"))
+ return node.body.range[0];
+
+ // "f" in function, "s" in set, "g" in get, first letter in any method name for classes.
+ return node.isGetterOrSetter ? node.getterOrSetterRange[0] : node.range[0];
+ }
+
</ins><span class="cx"> updateTypes(nodesToUpdate, callback)
</span><span class="cx"> {
</span><span class="cx"> console.assert(RuntimeAgent.getRuntimeTypesForVariablesAtOffsets);
</span><span class="lines">@@ -173,10 +190,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> allRequests.push({
</span><span class="cx"> typeInformationDescriptor: WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor.FunctionReturn,
</span><span class="cx"> sourceID,
</span><del>- divot: node.body.range[0]
</del><ins>+ divot: WebInspector.ScriptSyntaxTree.functionReturnDivot(node)
</ins><span class="cx"> });
</span><span class="cx"> allRequestNodes.push(node);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>