<!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>[196302] 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/196302">196302</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 19:46:37 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Error construction for inlined operations should not use the inliner's CodeBlock
https://bugs.webkit.org/show_bug.cgi?id=154021
Reviewed by Mark Lam.
Previously, if one function, A, was inlined into another function, B, in the DFG/FTL
we would use B's DFG/FTL CodeBlock to construct source information about the Error.
We would correctly compute the bytecodeOffset in A for the an expression but we would
not use one of A's CodeBlocks when looking up source. This caused crashes during
operationIn as we expected to be able to find the text "in" in the source.
* runtime/ErrorInstance.cpp:
(JSC::appendSourceToError):
* tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js: Added.
(map):
(n):
(one):
(catch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorInstancecpp">trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressinlinederrorgetscorrectcodeblockforbytecodeoffsetjs">trunk/Source/JavaScriptCore/tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196301 => 196302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-09 03:33:17 UTC (rev 196301)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-09 03:46:37 UTC (rev 196302)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-08 Keith Miller <keith_miller@apple.com>
+
+ Error construction for inlined operations should not use the inliner's CodeBlock
+ https://bugs.webkit.org/show_bug.cgi?id=154021
+
+ Reviewed by Mark Lam.
+
+ Previously, if one function, A, was inlined into another function, B, in the DFG/FTL
+ we would use B's DFG/FTL CodeBlock to construct source information about the Error.
+ We would correctly compute the bytecodeOffset in A for the an expression but we would
+ not use one of A's CodeBlocks when looking up source. This caused crashes during
+ operationIn as we expected to be able to find the text "in" in the source.
+
+ * runtime/ErrorInstance.cpp:
+ (JSC::appendSourceToError):
+ * tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js: Added.
+ (map):
+ (n):
+ (one):
+ (catch):
+
</ins><span class="cx"> 2016-02-08 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> runtimeTypeForValue should protect against seeing TDZ value
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorInstancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp (196301 => 196302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2016-02-09 03:33:17 UTC (rev 196301)
+++ trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2016-02-09 03:46:37 UTC (rev 196302)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "ErrorInstance.h"
</span><span class="cx">
</span><span class="cx"> #include "CodeBlock.h"
</span><ins>+#include "InlineCallFrame.h"
</ins><span class="cx"> #include "JSScope.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSGlobalObjectFunctions.h"
</span><span class="lines">@@ -53,8 +54,14 @@
</span><span class="cx"> int divotPoint = 0;
</span><span class="cx"> unsigned line = 0;
</span><span class="cx"> unsigned column = 0;
</span><del>-
- CodeBlock* codeBlock = callFrame->codeBlock();
</del><ins>+
+ CodeBlock* codeBlock;
+ CodeOrigin codeOrigin = callFrame->codeOrigin();
+ if (codeOrigin && codeOrigin.inlineCallFrame)
+ codeBlock = baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame);
+ else
+ codeBlock = callFrame->codeBlock();
+
</ins><span class="cx"> codeBlock->expressionRangeForBytecodeOffset(bytecodeOffset, divotPoint, startOffset, endOffset, line, column);
</span><span class="cx">
</span><span class="cx"> int expressionStart = divotPoint - startOffset;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressinlinederrorgetscorrectcodeblockforbytecodeoffsetjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js (0 => 196302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/inlined-error-gets-correct-codeblock-for-bytecodeoffset.js 2016-02-09 03:46:37 UTC (rev 196302)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+function map(e,t,i){
+ var r;
+ var o=0;
+ var s=e.length;
+ var a=n(e);
+ var l=[];
+ if(a) {
+ for(;s>o;o++){
+ r=t(e[o],o,i);
+ null!=r&&l.push(r);
+ }
+ }
+ return l
+}
+
+function n(e){
+ var t="length" in e && e.length;
+ var n = typeof e;
+ return "function" === n || t;
+}
+noInline(map);
+
+function one() { return 1; }
+
+for(i = 0; i < 20000; i++) {
+ map([], one, "");
+}
+
+// This should throw an exception but it shouldn't crash.
+try {
+ map("", one, "");
+} catch (e) { }
</ins></span></pre>
</div>
</div>
</body>
</html>