<!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>[192228] releases/WebKitGTK/webkit-2.10</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/192228">192228</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 03:37:23 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191765">r191765</a> - Crash making a tail call from a getter to a host function
https://bugs.webkit.org/show_bug.cgi?id=150663
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Change the inline assembly versions of getHostCallReturnValue() to pass the location of the callee
call frame to getHostCallReturnValueWithExecState(). We were passing the caller's frame address.
* jit/JITOperations.cpp:
LayoutTests:
New regression tests.
* js/regress-150663-expected.txt: Added.
* js/regress-150663.html: Added.
* js/script-tests/regress-150663.js: Added.
(Test):
(Test.prototype.get sum):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCorejitJITOperationscpp">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsjsregress150663expectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsjsregress150663html">releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsjsscripttestsregress150663js">releases/WebKitGTK/webkit-2.10/LayoutTests/js/script-tests/regress-150663.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192227 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 11:30:38 UTC (rev 192227)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 11:37:23 UTC (rev 192228)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-29 Michael Saboff <msaboff@apple.com>
+
+ Crash making a tail call from a getter to a host function
+ https://bugs.webkit.org/show_bug.cgi?id=150663
+
+ Reviewed by Geoffrey Garen.
+
+ New regression tests.
+
+ * js/regress-150663-expected.txt: Added.
+ * js/regress-150663.html: Added.
+ * js/script-tests/regress-150663.js: Added.
+ (Test):
+ (Test.prototype.get sum):
+
</ins><span class="cx"> 2015-10-29 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Exploitable crash happens when an SVG contains an indirect resource inheritance cycle
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsjsregress150663expectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663-expected.txt (0 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663-expected.txt 2015-11-10 11:37:23 UTC (rev 192228)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for 150663
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Able to tail call a native function from a JS callee of C++ code
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsjsregress150663html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663.html (0 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/js/regress-150663.html 2015-11-10 11:37:23 UTC (rev 192228)
</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-150663.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsjsscripttestsregress150663js"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/js/script-tests/regress-150663.js (0 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/js/script-tests/regress-150663.js (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/js/script-tests/regress-150663.js 2015-11-10 11:37:23 UTC (rev 192228)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+description("Regression test for 150663");
+
+// We should be able to tail call a native function from a JS callee of C++
+
+"use strict";
+
+class Test {
+ constructor(a, b)
+ {
+ this.a = a;
+ this.b = b;
+ }
+
+ get sum()
+ {
+ return Number(this.a + this.b);
+ }
+}
+
+var testObj = new Test(40, 2);
+
+for (var i = 0; i < 100000; i++) {
+ var result = testObj.sum;
+ if (result != 42)
+ testFailed("Expected 42 from \"sum\" getter, got " + result);
+}
+
+testPassed("Able to tail call a native function from a JS callee of C++ code");
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog (192227 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog 2015-11-10 11:30:38 UTC (rev 192227)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog 2015-11-10 11:37:23 UTC (rev 192228)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-29 Michael Saboff <msaboff@apple.com>
+
+ Crash making a tail call from a getter to a host function
+ https://bugs.webkit.org/show_bug.cgi?id=150663
+
+ Reviewed by Geoffrey Garen.
+
+ Change the inline assembly versions of getHostCallReturnValue() to pass the location of the callee
+ call frame to getHostCallReturnValueWithExecState(). We were passing the caller's frame address.
+
+ * jit/JITOperations.cpp:
+
</ins><span class="cx"> 2015-10-23 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r179357-r179359): WebContent Crash using AOL Mail @ com.apple.JavascriptCore JSC::linkPolymorphicCall(JSC::ExecState*, JSC::CallLinkInfo&, JSC::CallVariant, JSC::RegisterPreservationMode) + 1584
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/jit/JITOperations.cpp (192227 => 192228)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/jit/JITOperations.cpp 2015-11-10 11:30:38 UTC (rev 192227)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/jit/JITOperations.cpp 2015-11-10 11:37:23 UTC (rev 192228)
</span><span class="lines">@@ -1974,7 +1974,7 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov %rbp, %rdi\n"
</del><ins>+ "lea -8(%rsp), %rdi\n"
</ins><span class="cx"> "jmp " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1985,8 +1985,9 @@
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><span class="cx"> "push %ebp\n"
</span><ins>+ "mov %esp, %eax\n"
</ins><span class="cx"> "leal -4(%esp), %esp\n"
</span><del>- "push %ebp\n"
</del><ins>+ "push %eax\n"
</ins><span class="cx"> "call " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> "leal 8(%esp), %esp\n"
</span><span class="cx"> "pop %ebp\n"
</span><span class="lines">@@ -2002,7 +2003,7 @@
</span><span class="cx"> ".thumb" "\n"
</span><span class="cx"> ".thumb_func " THUMB_FUNC_PARAM(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov r0, r7" "\n"
</del><ins>+ "sub r0, sp, #8" "\n"
</ins><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -2013,7 +2014,7 @@
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> INLINE_ARM_FUNCTION(getHostCallReturnValue)
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov r0, r11" "\n"
</del><ins>+ "sub r0, sp, #8" "\n"
</ins><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -2024,7 +2025,7 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov x0, x29" "\n"
</del><ins>+ "sub x0, sp, #16" "\n"
</ins><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -2046,7 +2047,7 @@
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><span class="cx"> LOAD_FUNCTION_TO_T9(getHostCallReturnValueWithExecState)
</span><del>- "move $a0, $fp" "\n"
</del><ins>+ "subi $a0, $sp, 8" "\n"
</ins><span class="cx"> "b " LOCAL_REFERENCE(getHostCallReturnValueWithExecState) "\n"
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -2059,7 +2060,8 @@
</span><span class="cx"> ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n"
</span><span class="cx"> HIDE_SYMBOL(getHostCallReturnValue) "\n"
</span><span class="cx"> SYMBOL_STRING(getHostCallReturnValue) ":" "\n"
</span><del>- "mov r14, r4" "\n"
</del><ins>+ "mov r15, r4" "\n"
+ "add -8, r4" "\n"
</ins><span class="cx"> "mov.l 2f, " SH4_SCRATCH_REGISTER "\n"
</span><span class="cx"> "braf " SH4_SCRATCH_REGISTER "\n"
</span><span class="cx"> "nop" "\n"
</span><span class="lines">@@ -2071,7 +2073,8 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> __declspec(naked) EncodedJSValue HOST_CALL_RETURN_VALUE_OPTION getHostCallReturnValue()
</span><span class="cx"> {
</span><del>- __asm mov [esp + 4], ebp;
</del><ins>+ __asm lea eax, [esp - 4]
+ __asm mov [esp + 4], eax;
</ins><span class="cx"> __asm jmp getHostCallReturnValueWithExecState
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>