<!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>[191455] 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/191455">191455</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 09:12:42 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/191360">r191360</a>): Repro Crash: com.apple.WebKit.WebContent at JavaScriptCore:JSC::ExecState::bytecodeOffset + 174
https://bugs.webkit.org/show_bug.cgi?id=150434
Reviewed by Mark Lam.
Source/JavaScriptCore:
Pass the current frame instead of the caller frame to operationVMHandleException when processing an
exception in one of the native thunks.
* jit/JITExceptions.cpp:
(JSC::genericUnwind): Made debug printing of CodeBlock safe for call frames without one.
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::privateCompileCTINativeCall):
* jit/ThunkGenerators.cpp:
(JSC::nativeForGenerator):
LayoutTests:
New regression test.
* js/regress-150434-expected.txt: Added.
* js/regress-150434.html: Added.
* js/script-tests/regress-150434.js: Added.
(bar):
(foo):
(test):</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="#trunkSourceJavaScriptCorejitJITExceptionscpp">trunk/Source/JavaScriptCore/jit/JITExceptions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress150434expectedtxt">trunk/LayoutTests/js/regress-150434-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress150434html">trunk/LayoutTests/js/regress-150434.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress150434js">trunk/LayoutTests/js/script-tests/regress-150434.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191454 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-22 15:48:09 UTC (rev 191454)
+++ trunk/LayoutTests/ChangeLog 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-22 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION(r191360): Repro Crash: com.apple.WebKit.WebContent at JavaScriptCore:JSC::ExecState::bytecodeOffset + 174
+ https://bugs.webkit.org/show_bug.cgi?id=150434
+
+ Reviewed by Mark Lam.
+
+ New regression test.
+
+ * js/regress-150434-expected.txt: Added.
+ * js/regress-150434.html: Added.
+ * js/script-tests/regress-150434.js: Added.
+ (bar):
+ (foo):
+ (test):
+
</ins><span class="cx"> 2015-10-22 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement touch-action: manipulation; for iOS
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress150434expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-150434-expected.txt (0 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-150434-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-150434-expected.txt 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for https://webkit.org/b/150434.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Properly handled an exception from a tail called native function that was called by a native function
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress150434html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-150434.html (0 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-150434.html (rev 0)
+++ trunk/LayoutTests/js/regress-150434.html 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-150434.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress150434js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-150434.js (0 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-150434.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-150434.js 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+description("Regression test for https://webkit.org/b/150434.");
+
+// This test verifies that we can process an exception thrown from a natively called function
+// that was tail called from a JS function that was native called itself.
+// We use bind to create a native wrapper around JS functions.
+
+var myException = "This shouldn't crash!";
+
+function bar(a, idx)
+{
+ "use strict";
+
+ if (idx > 0)
+ throw myException;
+
+ return a;
+}
+
+boundBar = bar.bind(null, 42);
+
+function foo(a, idx)
+{
+ "use strict";
+
+ return boundBar(idx);
+}
+
+boundFoo = foo.bind(null, 41);
+
+function test()
+{
+ for (var i = 0; i < 200000; i++) {
+ try {
+ if (boundFoo(i) != 42)
+ testFailed("Got wrong result from foo()!");
+ } catch (e) {
+ if (e != myException)
+ print(e);
+ }
+ }
+}
+
+noInline(test);
+
+test();
+
+testPassed("Properly handled an exception from a tail called native function that was called by a native function");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191454 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-22 15:48:09 UTC (rev 191454)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-10-22 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION(r191360): Repro Crash: com.apple.WebKit.WebContent at JavaScriptCore:JSC::ExecState::bytecodeOffset + 174
+ https://bugs.webkit.org/show_bug.cgi?id=150434
+
+ Reviewed by Mark Lam.
+
+ Pass the current frame instead of the caller frame to operationVMHandleException when processing an
+ exception in one of the native thunks.
+
+ * jit/JITExceptions.cpp:
+ (JSC::genericUnwind): Made debug printing of CodeBlock safe for call frames without one.
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::privateCompileCTINativeCall):
+ * jit/ThunkGenerators.cpp:
+ (JSC::nativeForGenerator):
+
</ins><span class="cx"> 2015-10-21 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Restructure generate-js-bindings script to be modular and testable
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITExceptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (191454 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITExceptions.cpp 2015-10-22 15:48:09 UTC (rev 191454)
+++ trunk/Source/JavaScriptCore/jit/JITExceptions.cpp 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -42,7 +42,11 @@
</span><span class="cx"> void genericUnwind(VM* vm, ExecState* callFrame, UnwindStart unwindStart)
</span><span class="cx"> {
</span><span class="cx"> if (Options::breakOnThrow()) {
</span><del>- dataLog("In call frame ", RawPointer(callFrame), " for code block ", *callFrame->codeBlock(), "\n");
</del><ins>+ CodeBlock* codeBlock = callFrame->codeBlock();
+ if (codeBlock)
+ dataLog("In call frame ", RawPointer(callFrame), " for code block ", *codeBlock, "\n");
+ else
+ dataLog("In call frame ", RawPointer(callFrame), " with null CodeBlock\n");
</ins><span class="cx"> CRASH();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (191454 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-10-22 15:48:09 UTC (rev 191454)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -110,10 +110,10 @@
</span><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><span class="cx"> addPtr(TrustedImm32(-4), stackPointerRegister);
</span><del>- loadPtr(Address(callFrameRegister), X86Registers::ecx);
</del><ins>+ move(callFrameRegister, X86Registers::ecx);
</ins><span class="cx"> push(X86Registers::ecx);
</span><span class="cx"> #else
</span><del>- loadPtr(Address(callFrameRegister), argumentGPR0);
</del><ins>+ move(callFrameRegister, argumentGPR0);
</ins><span class="cx"> #endif
</span><span class="cx"> move(TrustedImmPtr(FunctionPtr(operationVMHandleException).value()), regT3);
</span><span class="cx"> call(regT3);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (191454 => 191455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-10-22 15:48:09 UTC (rev 191454)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-10-22 16:12:42 UTC (rev 191455)
</span><span class="lines">@@ -358,14 +358,14 @@
</span><span class="cx">
</span><span class="cx"> #if CPU(X86) && USE(JSVALUE32_64)
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::TrustedImm32(-12), JSInterfaceJIT::stackPointerRegister);
</span><del>- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister), JSInterfaceJIT::regT0);
</del><ins>+ jit.move(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::regT0);
</ins><span class="cx"> jit.push(JSInterfaceJIT::regT0);
</span><span class="cx"> #else
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> // Allocate space on stack for the 4 parameter registers.
</span><span class="cx"> jit.subPtr(JSInterfaceJIT::TrustedImm32(4 * sizeof(int64_t)), JSInterfaceJIT::stackPointerRegister);
</span><span class="cx"> #endif
</span><del>- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister), JSInterfaceJIT::argumentGPR0);
</del><ins>+ jit.move(JSInterfaceJIT::callFrameRegister, JSInterfaceJIT::argumentGPR0);
</ins><span class="cx"> #endif
</span><span class="cx"> jit.move(JSInterfaceJIT::TrustedImmPtr(FunctionPtr(operationVMHandleException).value()), JSInterfaceJIT::regT3);
</span><span class="cx"> jit.call(JSInterfaceJIT::regT3);
</span></span></pre>
</div>
</div>
</body>
</html>