<!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>[212620] 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/212620">212620</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-02-19 19:59:19 -0800 (Sun, 19 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>functionTestWasmModuleFunctions() should use a MarkedArgumentBuffer for storing args instead of a Vector.
https://bugs.webkit.org/show_bug.cgi?id=168574
Reviewed by Filip Pizlo.
* jsc.cpp:
(callWasmFunction):
(functionTestWasmModuleFunctions):
* runtime/ArgList.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArgListh">trunk/Source/JavaScriptCore/runtime/ArgList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (212619 => 212620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2017-02-20 02:38:43 UTC (rev 212619)
+++ trunk/Source/JavaScriptCore/ChangeLog        2017-02-20 03:59:19 UTC (rev 212620)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2017-02-19 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ functionTestWasmModuleFunctions() should use a MarkedArgumentBuffer for storing args instead of a Vector.
+ https://bugs.webkit.org/show_bug.cgi?id=168574
+
+ Reviewed by Filip Pizlo.
+
+ * jsc.cpp:
+ (callWasmFunction):
+ (functionTestWasmModuleFunctions):
+ * runtime/ArgList.h:
+
+2017-02-19 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> CachedCall should let GC know to keep its arguments alive.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168567
</span><span class="cx"> <rdar://problem/30475767>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (212619 => 212620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp        2017-02-20 02:38:43 UTC (rev 212619)
+++ trunk/Source/JavaScriptCore/jsc.cpp        2017-02-20 03:59:19 UTC (rev 212620)
</span><span class="lines">@@ -3069,7 +3069,8 @@
</span><span class="cx"> return JSValue::decode(bitwise_cast<uint64_t>(result));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue callWasmFunction(VM* vm, JSGlobalObject* globalObject, JSWebAssemblyCallee* wasmCallee, Vector<JSValue>& boxedArgs)
</del><ins>+// FIXME: https://bugs.webkit.org/show_bug.cgi?id=168582.
+static JSValue callWasmFunction(VM* vm, JSGlobalObject* globalObject, JSWebAssemblyCallee* wasmCallee, const ArgList& boxedArgs)
</ins><span class="cx"> {
</span><span class="cx"> JSValue firstArgument;
</span><span class="cx"> int argCount = 1;
</span><span class="lines">@@ -3135,7 +3136,7 @@
</span><span class="cx"> JSObject* result = jsCast<JSObject*>(test->getIndexQuickly(0));
</span><span class="cx"> JSArray* arguments = jsCast<JSArray*>(test->getIndexQuickly(1));
</span><span class="cx">
</span><del>- Vector<JSValue> boxedArgs;
</del><ins>+ MarkedArgumentBuffer boxedArgs;
</ins><span class="cx"> for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
</span><span class="cx"> boxedArgs.append(box(exec, vm, arguments->getIndexQuickly(argIndex)));
</span><span class="cx">
</span><span class="lines">@@ -3150,7 +3151,7 @@
</span><span class="cx"> dataLog("Arguments: ");
</span><span class="cx"> CommaPrinter comma(", ");
</span><span class="cx"> for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
</span><del>- dataLog(comma, valueWithTypeOfWasmValue(exec, vm, boxedArgs[argIndex], arguments->getIndexQuickly(argIndex)));
</del><ins>+ dataLog(comma, valueWithTypeOfWasmValue(exec, vm, boxedArgs.at(argIndex), arguments->getIndexQuickly(argIndex)));
</ins><span class="cx"> dataLogLn();
</span><span class="cx">
</span><span class="cx"> WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, toCString(" (callResult == ", valueWithTypeOfWasmValue(exec, vm, callResult, result), ", expected == ", valueWithTypeOfWasmValue(exec, vm, expected, result), ")").data());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArgListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArgList.h (212619 => 212620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArgList.h        2017-02-20 02:38:43 UTC (rev 212619)
+++ trunk/Source/JavaScriptCore/runtime/ArgList.h        2017-02-20 03:59:19 UTC (rev 212620)
</span><span class="lines">@@ -164,9 +164,13 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void getSlice(int startIndex, ArgList& result) const;
</span><span class="cx">
</span><del>-private:
</del><ins>+ // FIXME: This is only made public as a work around for jsc's test helper function,
+ // callWasmFunction() to use. Make this a private method again once we can remove
+ // callWasmFunction().
+ // https://bugs.webkit.org/show_bug.cgi?id=168582
</ins><span class="cx"> JSValue* data() const { return m_args; }
</span><span class="cx">
</span><ins>+private:
</ins><span class="cx"> JSValue* m_args;
</span><span class="cx"> int m_argCount;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>