fix table ref type

runtimeverification · Jan 18, 2024 · b03c138 · b03c138
1 parent b6cf5bf
commit b03c138
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pykwasm/src/pykwasm/wasm2kast.py b/pykwasm/src/pykwasm/wasm2kast.py
@@ -102,10 +102,7 @@ def func(f: Function):
 
 def table(t: Table):
     ls = limits(t.type.limits)
-    if isinstance(t.type.elem_type, addresses.FunctionAddress):
-        typ = a.funcref
-    else:
-        typ = a.externref
+    typ = ref_type(t.type.elem_type)
     return a.table(ls, typ)
 
 
@@ -123,7 +120,9 @@ def glob(g: Global):
 def ref_type(t: RefType):
     if t is addresses.FunctionAddress:
         return a.funcref
-    return a.externref
+    if t is addresses.ExternAddress:
+        return a.externref
+    raise ValueError(f'Invalid RefType: {t}')
 
 
 def elem_mode(m: ElemMode) -> KInner:

diff --git a/pykwasm/src/tests/integration/binary/tables.wat b/pykwasm/src/tests/integration/binary/tables.wat
@@ -1,2 +1,9 @@
 (module
-  (table 1 funcref))
+  (table (import "spectest" "table") 0 funcref)
+  (table 0 funcref)
+  (table 1 funcref)
+  (table 1 100 funcref)
+  (table 0 externref)
+  (table 1 externref)
+  (table 1 100 externref)
+)