From cefe7a48ac2070e1e7f092b028b4bdb93accf6cb Mon Sep 17 00:00:00 2001
From: Graham Kelly <gkgoat6700@gmail.com>
Date: Sun, 23 Jun 2024 14:30:46 -0400
Subject: [PATCH] full merge

---
 src/backend/mod.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index b11110c..c27e837 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -211,8 +211,8 @@ impl<'a> WasmFuncBackend<'a> {
                         self.lower_value(value, func);
                     }
                     func.instruction(&wasm_encoder::Instruction::ReturnCallIndirect {
-                        ty: sig.index() as u32,
-                        table: table.index() as u32,
+                        type_index: sig.index() as u32,
+                        table_index: table.index() as u32,
                     });
                 }
                 WasmBlock::ReturnCallRef { sig, values } => {
@@ -300,8 +300,8 @@ impl<'a> WasmFuncBackend<'a> {
                 sig_index,
                 table_index,
             } => Some(wasm_encoder::Instruction::CallIndirect {
-                ty: sig_index.index() as u32,
-                table: table_index.index() as u32,
+                type_index: sig_index.index() as u32,
+                table_index: table_index.index() as u32,
             }),
             Operator::Select => Some(wasm_encoder::Instruction::Select),
             Operator::TypedSelect { ty } => Some(wasm_encoder::Instruction::TypedSelect(
@@ -1142,7 +1142,7 @@ pub fn compile(module: &Module<'_>) -> anyhow::Result<wasm_encoder::Module> {
                     minimum: table
                         .func_elements
                         .as_ref()
-                        .map(|elts| elts.len() as u32)
+                        .map(|elts| elts.len() as u64)
                         .unwrap_or(table.initial),
                     maximum: table.max,
                     table64: false,
@@ -1196,7 +1196,7 @@ pub fn compile(module: &Module<'_>) -> anyhow::Result<wasm_encoder::Module> {
                 .func_elements
                 .as_ref()
                 .map(|elt| elt.len())
-                .unwrap_or(0) as u32,
+                .unwrap_or(0) as u64,
             maximum: table_data.max,
             table64: false,
         });