<!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>[225416] 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/225416">225416</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2017-12-01 14:19:03 -0800 (Fri, 01 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebAssembly: stack trace improvement follow-ups
https://bugs.webkit.org/show_bug.cgi?id=180273

Reviewed by Saam Barati.

* wasm/WasmIndexOrName.cpp:
(JSC::Wasm::makeString):
* wasm/WasmIndexOrName.h:
(JSC::Wasm::IndexOrName::nameSection const):
* wasm/WasmNameSection.h:
(JSC::Wasm::NameSection::NameSection):
(JSC::Wasm::NameSection::get):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmIndexOrNamecpp">trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmIndexOrNameh">trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmNameSectionh">trunk/Source/JavaScriptCore/wasm/WasmNameSection.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (225415 => 225416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2017-12-01 22:14:55 UTC (rev 225415)
+++ trunk/Source/JavaScriptCore/ChangeLog       2017-12-01 22:19:03 UTC (rev 225416)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-12-01  JF Bastien  <jfbastien@apple.com>
</span><span class="cx"> 
</span><ins>+        WebAssembly: stack trace improvement follow-ups
+        https://bugs.webkit.org/show_bug.cgi?id=180273
+
+        Reviewed by Saam Barati.
+
+        * wasm/WasmIndexOrName.cpp:
+        (JSC::Wasm::makeString):
+        * wasm/WasmIndexOrName.h:
+        (JSC::Wasm::IndexOrName::nameSection const):
+        * wasm/WasmNameSection.h:
+        (JSC::Wasm::NameSection::NameSection):
+        (JSC::Wasm::NameSection::get):
+
+2017-12-01  JF Bastien  <jfbastien@apple.com>
+
</ins><span class="cx">         WebAssembly: restore cached stack limit after out-call
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=179106
</span><span class="cx">         <rdar://problem/35337525>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmIndexOrNamecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.cpp (225415 => 225416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.cpp     2017-12-01 22:14:55 UTC (rev 225415)
+++ trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.cpp        2017-12-01 22:19:03 UTC (rev 225416)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> String makeString(const IndexOrName& ion)
</span><span class="cx"> {
</span><span class="cx">     if (ion.isEmpty())
</span><del>-        return String("wasm-stub");
</del><ins>+        return ASCIILiteral("wasm-stub");
</ins><span class="cx">     const String moduleName = ion.nameSection()->moduleName.size() ? String(ion.nameSection()->moduleName.data(), ion.nameSection()->moduleName.size()) : String(ion.nameSection()->moduleHash.data(), ion.nameSection()->moduleHash.size());
</span><span class="cx">     if (ion.isIndex())
</span><del>-        return makeString(moduleName, ".wasm-function[", String::number(ion.m_indexName.index & ~IndexOrName::indexTag), "]");
-    return makeString(moduleName, ".wasm-function[", String(ion.m_indexName.name->data(), ion.m_indexName.name->size()), "]");
</del><ins>+        return makeString(moduleName, ".wasm-function[", String::number(ion.m_indexName.index & ~IndexOrName::indexTag), ']');
+    return makeString(moduleName, ".wasm-function[", String(ion.m_indexName.name->data(), ion.m_indexName.name->size()), ']');
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } } // namespace JSC::Wasm
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmIndexOrNameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.h (225415 => 225416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.h       2017-12-01 22:14:55 UTC (rev 225415)
+++ trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.h  2017-12-01 22:19:03 UTC (rev 225416)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">     bool isEmpty() const { return bitwise_cast<Index>(m_indexName) & emptyTag; }
</span><span class="cx">     bool isIndex() const { return bitwise_cast<Index>(m_indexName) & indexTag; }
</span><span class="cx">     bool isName() const { return !(isEmpty() || isName()); }
</span><del>-    NameSection* nameSection() const { return m_nameSection ? m_nameSection.get() : nullptr; }
</del><ins>+    NameSection* nameSection() const { return m_nameSection.get(); }
</ins><span class="cx"> 
</span><span class="cx">     friend String makeString(const IndexOrName&);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmNameSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmNameSection.h (225415 => 225416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmNameSection.h       2017-12-01 22:14:55 UTC (rev 225415)
+++ trunk/Source/JavaScriptCore/wasm/WasmNameSection.h  2017-12-01 22:19:03 UTC (rev 225416)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "WasmName.h"
</span><ins>+#include <wtf/Noncopyable.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -34,6 +35,9 @@
</span><span class="cx"> namespace JSC { namespace Wasm {
</span><span class="cx"> 
</span><span class="cx"> struct NameSection : public ThreadSafeRefCounted<NameSection> {
</span><ins>+    WTF_MAKE_NONCOPYABLE(NameSection);
+
+public:
</ins><span class="cx">     NameSection(const CString &hash)
</span><span class="cx">         : moduleHash(hash.length())
</span><span class="cx">     {
</span><span class="lines">@@ -40,11 +44,10 @@
</span><span class="cx">         for (size_t i = 0; i < hash.length(); ++i)
</span><span class="cx">             moduleHash[i] = static_cast<uint8_t>(*(hash.data() + i));
</span><span class="cx">     }
</span><del>-    NameSection(const NameSection&) = delete;
</del><span class="cx"> 
</span><span class="cx">     std::pair<const Name*, RefPtr<NameSection>> get(size_t functionIndexSpace)
</span><span class="cx">     {
</span><del>-        return std::make_pair(functionIndexSpace < functionNames.size() ? &functionNames[functionIndexSpace] : nullptr, RefPtr<NameSection>(this));
</del><ins>+        return std::make_pair(functionIndexSpace < functionNames.size() ? &functionNames[functionIndexSpace] : nullptr, makeRefPtr(this));
</ins><span class="cx">     }
</span><span class="cx">     Name moduleName;
</span><span class="cx">     Name moduleHash;
</span></span></pre>
</div>
</div>

</body>
</html>