Changeset 293314 in webkit

Timestamp:

Apr 24, 2022, 11:36:11 PM (4 years ago)

Author:

dbezhetskov

Message:

[Wasm] Remove confusing isFuncref and isExternref
​https://bugs.webkit.org/show_bug.cgi?id=239699

Reviewed by Yusuke Suzuki.

There are two functions with the same name Wasm::Type::isFuncref and
Wasm::isFuncref but with different behaviour, and so,
this brings confusion into the codebase.
The first function checks that .kind == funcref and the second one checks
for the same but with respect to typed function references proposal.
The second one should be used when we want to check that type is funcref,
so the first one is not needed and actually not used, so this patch removes it.

The same situation is for isExternref.

• wasm/generateWasmOpsHeader.py:

(typeMacroizer):
(typeMacroizerFiltered):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/generateWasmOpsHeader.py (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2022-04-24  Dmitry Bezhetskov  <dbezhetskov@igalia.com>
+
+        [Wasm] Remove confusing isFuncref and isExternref
+        https://bugs.webkit.org/show_bug.cgi?id=239699
+
+        Reviewed by Yusuke Suzuki.
+
+        There are two functions with the same name Wasm::Type::isFuncref and
+        Wasm::isFuncref but with different behaviour, and so,
+        this brings confusion into the codebase.
+        The first function checks that .kind == funcref and the second one checks
+        for the same but with respect to typed function references proposal.
+        The second one should be used when we want to check that type is funcref, 
+        so the first one is not needed and actually not used, so this patch removes it.
+
+        The same situation is for isExternref.
+
+        * wasm/generateWasmOpsHeader.py:
+        (typeMacroizer):
+        (typeMacroizerFiltered):
+
 2022-04-24  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/JavaScriptCore/wasm/generateWasmOpsHeader.py

@@ -57 +57 @@
         inc += 1
 
+
+def typeMacroizerFiltered(filter):
+    for t in typeMacroizer():
+        if not filter(t):
+            yield t
+
 type_definitions = ["#define FOR_EACH_WASM_TYPE(macro)"]
 type_definitions.extend([t for t in typeMacroizer()])
 type_definitions = "".join(type_definitions)
+
+type_definitions_except_funcref_externref = ["#define FOR_EACH_WASM_TYPE_EXCEPT_FUNCREF_AND_EXTERNREF(macro)"]
+type_definitions_except_funcref_externref.extend([t for t in typeMacroizerFiltered(lambda x: x == "funcref" or x == "externref")])
+type_definitions_except_funcref_externref = "".join(type_definitions_except_funcref_externref)
 
 
@@ -207 +217 @@
 static constexpr unsigned numTypes = """ + str(len(types)) + """;
 
-""" + type_definitions + """
+""" + type_definitions + "\n" + """
+""" + type_definitions_except_funcref_externref + """
 #define CREATE_ENUM_VALUE(name, id, ...) name = id,
 enum class TypeKind : int8_t {
@@ -241 +252 @@
     }
 
+    // Use Wasm::isFuncref and Wasm::isExternref instead because they check againts all kind of representations of function referenes and external references.
+
     #define CREATE_PREDICATE(name, ...) bool is ## name() const { return kind == TypeKind::name; }
-    FOR_EACH_WASM_TYPE(CREATE_PREDICATE)
+    FOR_EACH_WASM_TYPE_EXCEPT_FUNCREF_AND_EXTERNREF(CREATE_PREDICATE)
     #undef CREATE_PREDICATE
 };