Changeset 288163 in webkit for trunk/Source/JavaScriptCore/wasm

Timestamp:

Jan 18, 2022, 4:50:16 PM (3 years ago)

Author:

[email protected]

Message:

[JSC] Remove Wasm::Table's m_mask
​https://bugs.webkit.org/show_bug.cgi?id=235329

Reviewed by Mark Lam.

This patch removes m_mask in Wasm::Table.
The mask is removed in the other places, but forgot
removing that in Wasm::Table.

• wasm/WasmTable.cpp:

(JSC::Wasm::Table::setLength):
(JSC::Wasm::Table::clear):
(JSC::Wasm::Table::set):
(JSC::Wasm::Table::get const):
(JSC::Wasm::FuncRefTable::setFunction):
(JSC::Wasm::FuncRefTable::function const):
(JSC::Wasm::FuncRefTable::instance const):

• wasm/WasmTable.h:

(JSC::Wasm::Table::offsetOfLength):
(JSC::Wasm::Table::offsetOfMask): Deleted.
(JSC::Wasm::Table::mask const): Deleted.

Location:

trunk/Source/JavaScriptCore/wasm

Files:

• WasmTable.cpp (modified) (5 diffs)
• WasmTable.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/wasm/WasmTable.cpp

@@ -43 +43 @@
 {
     m_length = length;
-    m_mask = WTF::maskForSize(length);
     ASSERT(isValidLength(length));
-    ASSERT(m_mask == WTF::maskForSize(allocatedLength(length)));
 }
 
@@ -143 +141 @@
     RELEASE_ASSERT(m_owner);
     if (auto* funcRefTable = asFuncrefTable()) {
-        funcRefTable->m_importableFunctions.get()[index & m_mask] = WasmToWasmImportableFunction();
-        ASSERT(funcRefTable->m_importableFunctions.get()[index & m_mask].signatureIndex == Wasm::Signature::invalidIndex); // We rely on this in compiled code.
-        funcRefTable->m_instances.get()[index & m_mask] = nullptr;
-    }
-    m_jsValues.get()[index & m_mask].setStartingValue(jsNull());
+        funcRefTable->m_importableFunctions.get()[index] = WasmToWasmImportableFunction();
+        ASSERT(funcRefTable->m_importableFunctions.get()[index].signatureIndex == Wasm::Signature::invalidIndex); // We rely on this in compiled code.
+        funcRefTable->m_instances.get()[index] = nullptr;
+    }
+    m_jsValues.get()[index].setStartingValue(jsNull());
 }
 
@@ -156 +154 @@
     RELEASE_ASSERT(m_owner);
     clear(index);
-    m_jsValues.get()[index & m_mask].set(m_owner->vm(), m_owner, value);
+    m_jsValues.get()[index].set(m_owner->vm(), m_owner, value);
 }
 
@@ -163 +161 @@
     RELEASE_ASSERT(index < length());
     RELEASE_ASSERT(m_owner);
-    return m_jsValues.get()[index & m_mask].get();
+    return m_jsValues.get()[index].get();
 }
 
@@ -211 +209 @@
     clear(index);
     if (optionalWrapper)
-        m_jsValues.get()[index & m_mask].set(m_owner->vm(), m_owner, optionalWrapper);
-    m_importableFunctions.get()[index & m_mask] = function;
-    m_instances.get()[index & m_mask] = instance;
+        m_jsValues.get()[index].set(m_owner->vm(), m_owner, optionalWrapper);
+    m_importableFunctions.get()[index] = function;
+    m_instances.get()[index] = instance;
 }
 
 const WasmToWasmImportableFunction& FuncRefTable::function(uint32_t index) const
 {
-    return m_importableFunctions.get()[index & m_mask];
+    return m_importableFunctions.get()[index];
 }
 
 Instance* FuncRefTable::instance(uint32_t index) const
 {
-    return m_instances.get()[index & m_mask];
+    return m_instances.get()[index];
 }
 

trunk/Source/JavaScriptCore/wasm/WasmTable.h

@@ -53 +53 @@
 
     static ptrdiff_t offsetOfLength() { return OBJECT_OFFSETOF(Table, m_length); }
-    static ptrdiff_t offsetOfMask() { return OBJECT_OFFSETOF(Table, m_mask); }
 
     static uint32_t allocatedLength(uint32_t length);
-    uint32_t mask() const { return m_mask; }
 
     template<typename T> T* owner() const { return reinterpret_cast<T*>(m_owner); }
@@ -89 +87 @@
 
     uint32_t m_length;
-    uint32_t m_mask;
     const TableElementType m_type;
     const std::optional<uint32_t> m_maximum;