Changeset 284805 in webkit

Timestamp:

Oct 25, 2021, 12:09:50 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r284467. rdar://problem/84327812

Wasm Table can take arbitrary default value
​https://bugs.webkit.org/show_bug.cgi?id=231933
rdar://84327812

Reviewed by Robin Morisset.

• wasm/WasmTable.cpp: (JSC::Wasm::Table::grow):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@284467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/WasmTable.cpp (modified) (1 diff)

branches/safari-612-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-10-25  Null  <null@apple.com>
+
+        Cherry-pick r284467. rdar://problem/84327812
+
+    Wasm Table can take arbitrary default value
+    https://bugs.webkit.org/show_bug.cgi?id=231933
+    rdar://84327812
+    
+    Reviewed by Robin Morisset.
+    
+    * wasm/WasmTable.cpp:
+    (JSC::Wasm::Table::grow):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284467 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-18  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Wasm Table can take arbitrary default value
+            https://bugs.webkit.org/show_bug.cgi?id=231933
+            rdar://84327812
+
+            Reviewed by Robin Morisset.
+
+            * wasm/WasmTable.cpp:
+            (JSC::Wasm::Table::grow):
+
 2021-10-25  Null  <null@apple.com>
 

branches/safari-612-branch/Source/JavaScriptCore/wasm/WasmTable.cpp

@@ -116 +116 @@
 
     if (auto* funcRefTable = asFuncrefTable()) {
-        if (!checkedGrow(funcRefTable->m_importableFunctions, [] (auto&) { }))
+        if (!checkedGrow(funcRefTable->m_importableFunctions, [](auto&) { }))
             return std::nullopt;
-        if (!checkedGrow(funcRefTable->m_instances, [] (auto&) { }))
+        if (!checkedGrow(funcRefTable->m_instances, [](auto&) { }))
             return std::nullopt;
     }
 
-    if (!checkedGrow(m_jsValues, [defaultValue] (WriteBarrier<Unknown>& slot) { slot.setStartingValue(defaultValue); }))
+    VM& vm = m_owner->vm();
+    if (!checkedGrow(m_jsValues, [&](WriteBarrier<Unknown>& slot) { slot.set(vm, m_owner, defaultValue); }))
         return std::nullopt;