
<!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>[210420] branches/safari-603-branch/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/210420">210420</a></dd>

<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>

<dt>Date</dt> <dd>2017-01-05 17:49:23 -0800 (Thu, 05 Jan 2017)</dd>

</dl>


<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210202">r210202</a>. rdar://problem/29803676</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#branchessafari603branchSourceJavaScriptCorejsccpp">branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (210419 => 210420)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog        2017-01-06 01:49:20 UTC (rev 210419)

+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog        2017-01-06 01:49:23 UTC (rev 210420)

</span><span class="lines">@@ -1,5 +1,16 @@

</span><span class="cx"> 2017-01-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Merge r210202. rdar://problem/29803676

+

+    2016-12-28  Saam Barati  &lt;sbarati@apple.com&gt;

+

+            Unreviewed. Fix jsc.cpp build error.

+

+            * jsc.cpp:

+            (functionTestWasmModuleFunctions):

+

+2017-01-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

+

</ins><span class="cx">         Merge r210201. rdar://problem/29803676

</span><span class="cx"> 

</span><span class="cx">     2016-12-28  Saam Barati  &lt;sbarati@apple.com&gt;

</span></span></pre></div>

<a id="branchessafari603branchSourceJavaScriptCorejsccpp"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp (210419 => 210420)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp        2017-01-06 01:49:20 UTC (rev 210419)

+++ branches/safari-603-branch/Source/JavaScriptCore/jsc.cpp        2017-01-06 01:49:23 UTC (rev 210420)

</span><span class="lines">@@ -2633,21 +2633,9 @@

</span><span class="cx">             });

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    void* memoryBytes = nullptr;

-    uint32_t memorySize = 0;

-    std::unique_ptr&lt;Wasm::Memory&gt; memory;

</del><span class="cx">     std::unique_ptr&lt;Wasm::ModuleInformation&gt; moduleInformation = plan.takeModuleInformation();

</span><ins>+    RELEASE_ASSERT(!moduleInformation-&gt;memory);

</ins><span class="cx"> 

</span><del>-    if (!!moduleInformation-&gt;memory) {

-        bool failed;

-        memory = std::make_unique&lt;Wasm::Memory&gt;(moduleInformation-&gt;memory.initial(), moduleInformation-&gt;memory.maximum(), failed);

-        RELEASE_ASSERT(!failed);

-        memoryBytes = memory-&gt;memory();

-        memorySize = memory-&gt;size();

-    }

-    vm.topWasmMemoryPointer = memoryBytes;

-    vm.topWasmMemorySize = memorySize;

-

</del><span class="cx">     for (uint32_t i = 0; i &lt; functionCount; ++i) {

</span><span class="cx">         JSArray* testCases = jsCast&lt;JSArray*&gt;(exec-&gt;argument(i + 2));

</span><span class="cx">         for (unsigned testIndex = 0; testIndex &lt; testCases-&gt;length(); ++testIndex) {

</span></span></pre>

</div>

</div>


</body>

</html>