Changeset 225416 in webkit

Timestamp:

Dec 1, 2017 2:19:03 PM (6 years ago)

Author:

jfbastien@apple.com

Message:

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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/WasmIndexOrName.cpp (modified) (1 diff)
• wasm/WasmIndexOrName.h (modified) (1 diff)
• wasm/WasmNameSection.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-12-01  JF Bastien  <jfbastien@apple.com>
+
+        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>
 

trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.cpp

@@ -47 +47 @@
 {
     if (ion.isEmpty())
-        return String("wasm-stub");
+        return ASCIILiteral("wasm-stub");
     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());
     if (ion.isIndex())
-        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()), "]");
+        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()), ']');
 }
 

trunk/Source/JavaScriptCore/wasm/WasmIndexOrName.h

@@ -44 +44 @@
     bool isIndex() const { return bitwise_cast<Index>(m_indexName) & indexTag; }
     bool isName() const { return !(isEmpty() || isName()); }
-    NameSection* nameSection() const { return m_nameSection ? m_nameSection.get() : nullptr; }
+    NameSection* nameSection() const { return m_nameSection.get(); }
 
     friend String makeString(const IndexOrName&);

trunk/Source/JavaScriptCore/wasm/WasmNameSection.h

@@ -27 +27 @@
 
 #include "WasmName.h"
+#include <wtf/Noncopyable.h>
 #include <wtf/text/CString.h>
 #include <wtf/ThreadSafeRefCounted.h>
@@ -35 +36 @@
 
 struct NameSection : public ThreadSafeRefCounted<NameSection> {
+    WTF_MAKE_NONCOPYABLE(NameSection);
+
+public:
     NameSection(const CString &hash)
         : moduleHash(hash.length())
@@ -41 +45 @@
             moduleHash[i] = static_cast<uint8_t>(*(hash.data() + i));
     }
-    NameSection(const NameSection&) = delete;
 
     std::pair<const Name*, RefPtr<NameSection>> get(size_t functionIndexSpace)
     {
-        return std::make_pair(functionIndexSpace < functionNames.size() ? &functionNames[functionIndexSpace] : nullptr, RefPtr<NameSection>(this));
+        return std::make_pair(functionIndexSpace < functionNames.size() ? &functionNames[functionIndexSpace] : nullptr, makeRefPtr(this));
     }
     Name moduleName;