A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Wasm translator: move stacks into FuncEnvironment. (#11955)
Chris Fallind28086570271
diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rsindex 52208e7d90..05282765f6 100644--- a/crates/cranelift/src/func_environ.rs+++ b/crates/cranelift/src/func_environ.rs@@ -13,7 +13,7 @@ use cranelift_codegen::ir::immediates::{Imm64, Offset32, V128Imm};use cranelift_codegen::ir::pcc::Fact;use cranelift_codegen::ir::{self, BlockArg, ExceptionTableData, ExceptionTableItem, types};use cranelift_codegen::ir::{ArgumentPurpose, ConstantData, Function, InstBuilder, MemFlags};-use cranelift_codegen::ir::{Block, ExceptionTag, types::*};+use cranelift_codegen::ir::{Block, types::*};use cranelift_codegen::isa::{TargetFrontendConfig, TargetIsa};use cranelift_entity::packed_option::{PackedOption, ReservedValue};use cranelift_entity::{EntityRef, PrimaryMap, SecondaryMap};@@ -105,6 +105,9 @@ pub struct FuncEnvironment<'module_environment> {needs_gc_heap: bool,entities: WasmEntities,+ /// Translation state at the given point.+ pub(crate) stacks: FuncTranslationStacks,+#[cfg(feature = "gc")]ty_to_gc_layout: std::collections::HashMap<wasmtime_environ::ModuleInternedTypeIndex,@@ -215,6 +218,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {sig_ref_to_ty: SecondaryMap::default(),needs_gc_heap: false,entities: WasmEntities::default(),+ stacks: FuncTranslationStacks::new(),#[cfg(feature = "gc")]ty_to_gc_layout: std::collections::HashMap::new(),@@ -1229,7 +1233,6 @@ impl<'module_environment> FuncEnvironment<'module_environment> {&mut self,validator: &FuncValidator<impl WasmModuleResources>,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,) -> WasmResult<()> {// Take ownership of the state-slot builder temporarily rather// than mutably borrowing so we can invoke a method below.@@ -1251,20 +1254,20 @@ impl<'module_environment> FuncEnvironment<'module_environment> {// to the instrumentation slot; or alternately, extending// the debug instrumentation mechanism to be able to// directly refer to the user stack-slot.- for i in stack.stack_shape.len()..stack.stack.len() {+ for i in self.stacks.stack_shape.len()..self.stacks.stack.len() {let parent_shape = i.checked_sub(1)- .map(|parent_idx| stack.stack_shape[parent_idx]);+ .map(|parent_idx| self.stacks.stack_shape[parent_idx]);if let Some(this_ty) = validator- .get_operand_type(stack.stack.len() - i - 1)+ .get_operand_type(self.stacks.stack.len() - i - 1).expect("Index should not be out of range"){let wasm_ty = self.convert_valtype(this_ty)?;let (this_shape, offset) =b.push_stack(parent_shape, FrameValType::from(wasm_ty));- stack.stack_shape.push(this_shape);+ self.stacks.stack_shape.push(this_shape);- let value = stack.stack[i];+ let value = self.stacks.stack[i];builder.ins().stack_store(value, slot, offset.offset());} else {// Unreachable code with unknown type -- no@@ -1279,14 +1282,11 @@ impl<'module_environment> FuncEnvironment<'module_environment> {Ok(())}- pub(crate) fn debug_tags(- &self,- stack: &FuncTranslationStacks,- srcloc: ir::SourceLoc,- ) -> Vec<ir::DebugTag> {+ pub(crate) fn debug_tags(&self, srcloc: ir::SourceLoc) -> Vec<ir::DebugTag> {if let Some((slot, _b)) = &self.state_slot {- stack.assert_debug_stack_is_synced();- let stack_shape = stack+ self.stacks.assert_debug_stack_is_synced();+ let stack_shape = self+ .stacks.stack_shape.last().map(|s| s.raw())@@ -1855,9 +1855,7 @@ impl FuncEnvironment<'_> {struct Call<'a, 'func, 'module_env> {builder: &'a mut FunctionBuilder<'func>,env: &'a mut FuncEnvironment<'module_env>,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,- handlers: Vec<(Option<ExceptionTag>, Block)>,tail: bool,}@@ -1878,17 +1876,12 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {pub fn new(builder: &'a mut FunctionBuilder<'func>,env: &'a mut FuncEnvironment<'module_env>,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> Self {- let handlers = handlers.into_iter().collect();Call {builder,env,- stack,srcloc,- handlers,tail: false,}}@@ -1897,15 +1890,12 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {pub fn new_tail(builder: &'a mut FunctionBuilder<'func>,env: &'a mut FuncEnvironment<'module_env>,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,) -> Self {Call {builder,env,- stack,srcloc,- handlers: vec![],tail: true,}}@@ -2343,7 +2333,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {&mut self,sig: ir::SigRef,) -> Option<(ir::ExceptionTable, Block, CallRets)> {- if self.handlers.len() > 0 {+ if !self.tail && !self.env.stacks.handlers.is_empty() {let continuation_block = self.builder.create_block();let mut args = vec![];let mut results = smallvec![];@@ -2364,14 +2354,14 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {.dfg.block_call(continuation_block, args.iter());let mut handlers = vec![ExceptionTableItem::Context(self.caller_vmctx())];- for (tag, block) in &self.handlers {+ for (tag, block) in self.env.stacks.handlers.handlers() {let block_call = self.builder.func.dfg- .block_call(*block, &[BlockArg::TryCallExn(0)]);+ .block_call(block, &[BlockArg::TryCallExn(0)]);handlers.push(match tag {- Some(tag) => ExceptionTableItem::Tag(*tag, block_call),+ Some(tag) => ExceptionTableItem::Tag(tag, block_call),None => ExceptionTableItem::Default(block_call),});}@@ -2457,7 +2447,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {}fn attach_tags(&mut self, inst: ir::Inst) {- let tags = self.env.debug_tags(self.stack, self.srcloc);+ let tags = self.env.debug_tags(self.srcloc);if !tags.is_empty() {self.builder.func.debug_tags.set(inst, tags);}@@ -2827,18 +2817,16 @@ impl FuncEnvironment<'_> {builder: &mut FunctionBuilder<'_>,tag_index: TagIndex,args: &[ir::Value],- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<()> {- gc::translate_exn_throw(self, builder, tag_index, args, handlers)+ gc::translate_exn_throw(self, builder, tag_index, args)}pub fn translate_exn_throw_ref(&mut self,builder: &mut FunctionBuilder<'_>,exnref: ir::Value,- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<()> {- gc::translate_exn_throw_ref(self, builder, exnref, handlers)+ gc::translate_exn_throw_ref(self, builder, exnref)}pub fn translate_array_new(@@ -3206,7 +3194,6 @@ impl FuncEnvironment<'_> {pub fn translate_call_indirect<'a>(&mut self,builder: &'a mut FunctionBuilder,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,features: &WasmFeatures,table_index: TableIndex,@@ -3214,9 +3201,8 @@ impl FuncEnvironment<'_> {sig_ref: ir::SigRef,callee: ir::Value,call_args: &[ir::Value],- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<Option<CallRets>> {- Call::new(builder, self, stack, srcloc, handlers).indirect_call(+ Call::new(builder, self, srcloc).indirect_call(features,table_index,ty_index,@@ -3229,54 +3215,40 @@ impl FuncEnvironment<'_> {pub fn translate_call<'a>(&mut self,builder: &'a mut FunctionBuilder,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,callee_index: FuncIndex,sig_ref: ir::SigRef,call_args: &[ir::Value],- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<CallRets> {- Call::new(builder, self, stack, srcloc, handlers).direct_call(- callee_index,- sig_ref,- call_args,- )+ Call::new(builder, self, srcloc).direct_call(callee_index, sig_ref, call_args)}pub fn translate_call_ref<'a>(&mut self,builder: &'a mut FunctionBuilder,- stack: &'a FuncTranslationStacks,srcloc: ir::SourceLoc,sig_ref: ir::SigRef,callee: ir::Value,call_args: &[ir::Value],- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<CallRets> {- Call::new(builder, self, stack, srcloc, handlers).call_ref(sig_ref, callee, call_args)+ Call::new(builder, self, srcloc).call_ref(sig_ref, callee, call_args)}pub fn translate_return_call(&mut self,builder: &mut FunctionBuilder,- stack: &FuncTranslationStacks,srcloc: ir::SourceLoc,callee_index: FuncIndex,sig_ref: ir::SigRef,call_args: &[ir::Value],) -> WasmResult<()> {- Call::new_tail(builder, self, stack, srcloc).direct_call(- callee_index,- sig_ref,- call_args,- )?;+ Call::new_tail(builder, self, srcloc).direct_call(callee_index, sig_ref, call_args)?;Ok(())}pub fn translate_return_call_indirect(&mut self,builder: &mut FunctionBuilder,- stack: &FuncTranslationStacks,srcloc: ir::SourceLoc,features: &WasmFeatures,table_index: TableIndex,@@ -3285,7 +3257,7 @@ impl FuncEnvironment<'_> {callee: ir::Value,call_args: &[ir::Value],) -> WasmResult<()> {- Call::new_tail(builder, self, stack, srcloc).indirect_call(+ Call::new_tail(builder, self, srcloc).indirect_call(features,table_index,ty_index,@@ -3299,13 +3271,12 @@ impl FuncEnvironment<'_> {pub fn translate_return_call_ref(&mut self,builder: &mut FunctionBuilder,- stack: &FuncTranslationStacks,srcloc: ir::SourceLoc,sig_ref: ir::SigRef,callee: ir::Value,call_args: &[ir::Value],) -> WasmResult<()> {- Call::new_tail(builder, self, stack, srcloc).call_ref(sig_ref, callee, call_args)?;+ Call::new_tail(builder, self, srcloc).call_ref(sig_ref, callee, call_args)?;Ok(())}@@ -3765,14 +3736,13 @@ impl FuncEnvironment<'_> {op: &Operator,_operand_types: Option<&[WasmValType]>,builder: &mut FunctionBuilder,- state: &FuncTranslationStacks,) -> WasmResult<()> {if self.tunables.consume_fuel {- self.fuel_before_op(op, builder, state.reachable());+ self.fuel_before_op(op, builder, self.is_reachable());}- if state.reachable() && self.state_slot.is_some() {+ if self.is_reachable() && self.state_slot.is_some() {let inst = builder.ins().sequence_point();- let tags = self.debug_tags(state, builder.srcloc());+ let tags = self.debug_tags(builder.srcloc());builder.func.debug_tags.set(inst, tags);}@@ -3784,13 +3754,12 @@ impl FuncEnvironment<'_> {op: &Operator,validator: &FuncValidator<impl WasmModuleResources>,builder: &mut FunctionBuilder,- state: &mut FuncTranslationStacks,) -> WasmResult<()> {- if self.tunables.consume_fuel && state.reachable() {+ if self.tunables.consume_fuel && self.is_reachable() {self.fuel_after_op(op, builder);}- if state.reachable() {- self.update_state_slot_stack(validator, builder, state)?;+ if self.is_reachable() {+ self.update_state_slot_stack(validator, builder)?;}Ok(())}@@ -3802,11 +3771,7 @@ impl FuncEnvironment<'_> {}}- pub fn before_translate_function(- &mut self,- builder: &mut FunctionBuilder,- _state: &FuncTranslationStacks,- ) -> WasmResult<()> {+ pub fn before_translate_function(&mut self, builder: &mut FunctionBuilder) -> WasmResult<()> {// If an explicit stack limit is requested, emit one here at the start// of the function.if let Some(gv) = self.stack_limit_at_function_entry {@@ -3841,12 +3806,8 @@ impl FuncEnvironment<'_> {Ok(())}- pub fn after_translate_function(- &mut self,- builder: &mut FunctionBuilder,- state: &FuncTranslationStacks,- ) -> WasmResult<()> {- if self.tunables.consume_fuel && state.reachable() {+ pub fn after_translate_function(&mut self, builder: &mut FunctionBuilder) -> WasmResult<()> {+ if self.tunables.consume_fuel && self.is_reachable() {self.fuel_function_exit(builder);}self.finish_debug_metadata(builder);@@ -4547,6 +4508,11 @@ impl FuncEnvironment<'_> {pub fn is_pulley(&self) -> bool {self.isa.triple().is_pulley()}++ /// Returns whether the current location is reachable.+ pub fn is_reachable(&self) -> bool {+ self.stacks.reachable()+ }}// Helper function to convert an `IndexType` to an `ir::Type`.diff --git a/crates/cranelift/src/func_environ/gc/disabled.rs b/crates/cranelift/src/func_environ/gc/disabled.rsindex 9a0fb4e036..13c41f27a1 100644--- a/crates/cranelift/src/func_environ/gc/disabled.rs+++ b/crates/cranelift/src/func_environ/gc/disabled.rs@@ -72,7 +72,6 @@ pub fn translate_exn_throw(_builder: &mut FunctionBuilder<'_>,_tag_index: TagIndex,_args: &[ir::Value],- _handlers: impl IntoIterator<Item = (Option<ir::ExceptionTag>, ir::Block)>,) -> WasmResult<()> {disabled()}@@ -81,7 +80,6 @@ pub fn translate_exn_throw_ref(_func_env: &mut FuncEnvironment<'_>,_builder: &mut FunctionBuilder<'_>,_exnref: ir::Value,- _handlers: impl IntoIterator<Item = (Option<ir::ExceptionTag>, ir::Block)>,) -> WasmResult<()> {disabled()}diff --git a/crates/cranelift/src/func_environ/gc/enabled.rs b/crates/cranelift/src/func_environ/gc/enabled.rsindex dc780f5e2a..378564c066 100644--- a/crates/cranelift/src/func_environ/gc/enabled.rs+++ b/crates/cranelift/src/func_environ/gc/enabled.rs@@ -4,9 +4,7 @@ use crate::func_environ::{Extension, FuncEnvironment};use crate::translate::{Heap, HeapData, StructFieldsVec, TargetEnvironment};use crate::{Reachability, TRAP_INTERNAL_ASSERT};use cranelift_codegen::ir::immediates::Offset32;-use cranelift_codegen::ir::{- Block, BlockArg, ExceptionTableData, ExceptionTableItem, ExceptionTag,-};+use cranelift_codegen::ir::{BlockArg, ExceptionTableData, ExceptionTableItem};use cranelift_codegen::{cursor::FuncCursor,ir::{self, InstBuilder, condcodes::IntCC},@@ -468,7 +466,6 @@ pub fn translate_exn_throw(builder: &mut FunctionBuilder<'_>,tag_index: TagIndex,args: &[ir::Value],- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<()> {let (instance_id, defined_tag_id) = func_env.get_instance_and_tag(builder, tag_index);let exnref = gc_compiler(func_env)?.alloc_exn(@@ -479,14 +476,13 @@ pub fn translate_exn_throw(instance_id,defined_tag_id,)?;- translate_exn_throw_ref(func_env, builder, exnref, handlers)+ translate_exn_throw_ref(func_env, builder, exnref)}pub fn translate_exn_throw_ref(func_env: &mut FuncEnvironment<'_>,builder: &mut FunctionBuilder<'_>,exnref: ir::Value,- handlers: impl IntoIterator<Item = (Option<ExceptionTag>, Block)>,) -> WasmResult<()> {let builtin = func_env.builtin_functions.throw_ref(builder.func);let sig = builder.func.dfg.ext_funcs[builtin].signature;@@ -503,7 +499,7 @@ pub fn translate_exn_throw_ref(builder.insert_block_after(continuation, current_block);let continuation_call = builder.func.dfg.block_call(continuation, &[]);let mut table_items = vec![ExceptionTableItem::Context(vmctx)];- for (tag, block) in handlers {+ for (tag, block) in func_env.stacks.handlers.handlers() {let block_call = builder.func.dfgdiff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rsindex b7855e3f27..e2dc4b539c 100644--- a/crates/cranelift/src/translate/code_translator.rs+++ b/crates/cranelift/src/translate/code_translator.rs@@ -76,7 +76,7 @@ use crate::bounds_checks::{BoundsCheck, bounds_check_and_compute_addr};use crate::func_environ::{Extension, FuncEnvironment};use crate::translate::TargetEnvironment;use crate::translate::environ::StructFieldsVec;-use crate::translate::stack::{ControlStackFrame, ElseData, FuncTranslationStacks};+use crate::translate::stack::{ControlStackFrame, ElseData};use crate::translate::translation_utils::{block_with_params, blocktype_params_results, f32_translation, f64_translation,};@@ -105,11 +105,11 @@ use wasmtime_environ::{/// when we can statically determine that a Wasm access will unconditionally/// trap.macro_rules! unwrap_or_return_unreachable_state {- ($state:ident, $value:expr) => {+ ($environ:ident, $value:expr) => {match $value {Reachability::Reachable(x) => x,Reachability::Unreachable => {- $state.reachable = false;+ $environ.stacks.reachable = false;return Ok(());}}@@ -122,13 +122,12 @@ pub fn translate_operator(op: &Operator,operand_types: Option<&[WasmValType]>,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {log::trace!("Translating Wasm opcode: {op:?}");- if !stack.reachable {- translate_unreachable_operator(validator, &op, builder, stack, environ)?;+ if !environ.is_reachable() {+ translate_unreachable_operator(validator, &op, builder, environ)?;return Ok(());}@@ -148,12 +147,12 @@ pub fn translate_operator(***********************************************************************************/Operator::LocalGet { local_index } => {let val = builder.use_var(Variable::from_u32(*local_index));- stack.push1(val);+ environ.stacks.push1(val);let label = ValueLabel::from_u32(*local_index);builder.set_val_label(val, label);}Operator::LocalSet { local_index } => {- let mut val = stack.pop1();+ let mut val = environ.stacks.pop1();// Ensure SIMD values are cast to their default Cranelift type, I8x16.let ty = builder.func.dfg.value_type(val);@@ -167,7 +166,7 @@ pub fn translate_operator(environ.state_slot_local_set(builder, *local_index, val);}Operator::LocalTee { local_index } => {- let mut val = stack.peek1();+ let mut val = environ.stacks.peek1();// Ensure SIMD values are cast to their default Cranelift type, I8x16.let ty = builder.func.dfg.value_type(val);@@ -186,11 +185,11 @@ pub fn translate_operator(Operator::GlobalGet { global_index } => {let global_index = GlobalIndex::from_u32(*global_index);let val = environ.translate_global_get(builder, global_index)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::GlobalSet { global_index } => {let global_index = GlobalIndex::from_u32(*global_index);- let mut val = stack.pop1();+ let mut val = environ.stacks.pop1();// Ensure SIMD values are cast to their default Cranelift type, I8x16.if builder.func.dfg.value_type(val).is_vector() {val = optionally_bitcast_vector(val, I8X16, builder);@@ -201,37 +200,37 @@ pub fn translate_operator(* `drop`, `nop`, `unreachable` and `select`.***********************************************************************************/Operator::Drop => {- stack.pop1();+ environ.stacks.pop1();}Operator::Select => {- let (mut arg1, mut arg2, cond) = stack.pop3();+ let (mut arg1, mut arg2, cond) = environ.stacks.pop3();if builder.func.dfg.value_type(arg1).is_vector() {arg1 = optionally_bitcast_vector(arg1, I8X16, builder);}if builder.func.dfg.value_type(arg2).is_vector() {arg2 = optionally_bitcast_vector(arg2, I8X16, builder);}- stack.push1(builder.ins().select(cond, arg1, arg2));+ environ.stacks.push1(builder.ins().select(cond, arg1, arg2));}Operator::TypedSelect { ty: _ } => {// We ignore the explicit type parameter as it is only needed for// validation, which we require to have been performed before// translation.- let (mut arg1, mut arg2, cond) = stack.pop3();+ let (mut arg1, mut arg2, cond) = environ.stacks.pop3();if builder.func.dfg.value_type(arg1).is_vector() {arg1 = optionally_bitcast_vector(arg1, I8X16, builder);}if builder.func.dfg.value_type(arg2).is_vector() {arg2 = optionally_bitcast_vector(arg2, I8X16, builder);}- stack.push1(builder.ins().select(cond, arg1, arg2));+ environ.stacks.push1(builder.ins().select(cond, arg1, arg2));}Operator::Nop => {// We do nothing}Operator::Unreachable => {environ.trap(builder, crate::TRAP_UNREACHABLE);- stack.reachable = false;+ environ.stacks.reachable = false;}/***************************** Control flow blocks *********************************** When starting a control flow block, we create a new `Block` that will hold the code@@ -247,19 +246,22 @@ pub fn translate_operator(Operator::Block { blockty } => {let (params, results) = blocktype_params_results(validator, *blockty)?;let next = block_with_params(builder, results.clone(), environ)?;- stack.push_block(next, params.len(), results.len());+ environ.stacks.push_block(next, params.len(), results.len());}Operator::Loop { blockty } => {let (params, results) = blocktype_params_results(validator, *blockty)?;let loop_body = block_with_params(builder, params.clone(), environ)?;let next = block_with_params(builder, results.clone(), environ)?;- canonicalise_then_jump(builder, loop_body, stack.peekn(params.len()));- stack.push_loop(loop_body, next, params.len(), results.len());+ canonicalise_then_jump(builder, loop_body, environ.stacks.peekn(params.len()));+ environ+ .stacks+ .push_loop(loop_body, next, params.len(), results.len());// Pop the initial `Block` actuals and replace them with the `Block`'s// params since control flow joins at the top of the loop.- stack.popn(params.len());- stack+ environ.stacks.popn(params.len());+ environ+ .stacks.stack.extend_from_slice(builder.block_params(loop_body));@@ -267,7 +269,7 @@ pub fn translate_operator(environ.translate_loop_header(builder)?;}Operator::If { blockty } => {- let val = stack.pop1();+ let val = environ.stacks.pop1();let next_block = builder.create_block();let (params, results) = blocktype_params_results(validator, *blockty)?;@@ -285,7 +287,7 @@ pub fn translate_operator(next_block,&[],destination,- stack.peekn(params.len()),+ environ.stacks.peekn(params.len()),);(destination,@@ -305,7 +307,7 @@ pub fn translate_operator(next_block,&[],else_block,- stack.peekn(params.len()),+ environ.stacks.peekn(params.len()),);builder.seal_block(else_block);(destination, ElseData::WithElse { else_block })@@ -320,7 +322,7 @@ pub fn translate_operator(// and we add nothing;// - either the If have an Else clause, in that case the destination of this jump// instruction will be changed later when we translate the Else operator.- stack.push_if(+ environ.stacks.push_if(destination,else_data,params.len(),@@ -329,8 +331,9 @@ pub fn translate_operator();}Operator::Else => {- let i = stack.control_stack.len() - 1;- match stack.control_stack[i] {+ let i = environ.stacks.control_stack.len() - 1;+ let reachable = environ.is_reachable();+ match environ.stacks.control_stack[i] {ControlStackFrame::If {ref else_data,head_is_reachable,@@ -343,11 +346,11 @@ pub fn translate_operator(// We finished the consequent, so record its final// reachability state.debug_assert!(consequent_ends_reachable.is_none());- *consequent_ends_reachable = Some(stack.reachable);+ *consequent_ends_reachable = Some(reachable);if head_is_reachable {// We have a branch from the head of the `if` to the `else`.- stack.reachable = true;+ environ.stacks.reachable = true;// Ensure we have a block for the `else` block (it may have// already been pre-allocated, see `ElseData` for details).@@ -364,9 +367,9 @@ pub fn translate_operator(canonicalise_then_jump(builder,destination,- stack.peekn(params.len()),+ environ.stacks.peekn(params.len()),);- stack.popn(params.len());+ environ.stacks.popn(params.len());builder.change_jump_destination(branch_inst,@@ -380,9 +383,9 @@ pub fn translate_operator(canonicalise_then_jump(builder,destination,- stack.peekn(num_return_values),+ environ.stacks.peekn(num_return_values),);- stack.popn(num_return_values);+ environ.stacks.popn(num_return_values);else_block}};@@ -407,10 +410,10 @@ pub fn translate_operator(}}Operator::End => {- let frame = stack.control_stack.pop().unwrap();+ let frame = environ.stacks.control_stack.pop().unwrap();let next_block = frame.following_code();let return_count = frame.num_return_values();- let return_args = stack.peekn_mut(return_count);+ let return_args = environ.stacks.peekn_mut(return_count);canonicalise_then_jump(builder, next_block, return_args);// You might expect that if we just finished an `if` block that@@ -428,10 +431,14 @@ pub fn translate_operator(builder.seal_block(header)}- frame.restore_catch_handlers(&mut stack.handlers, builder);+ frame.restore_catch_handlers(&mut environ.stacks.handlers, builder);- frame.truncate_value_stack_to_original_size(&mut stack.stack, &mut stack.stack_shape);- stack+ frame.truncate_value_stack_to_original_size(+ &mut environ.stacks.stack,+ &mut environ.stacks.stack_shape,+ );+ environ+ .stacks.stack.extend_from_slice(builder.block_params(next_block));}@@ -457,9 +464,9 @@ pub fn translate_operator(* `br_table`.***********************************************************************************/Operator::Br { relative_depth } => {- let i = stack.control_stack.len() - 1 - (*relative_depth as usize);+ let i = environ.stacks.control_stack.len() - 1 - (*relative_depth as usize);let (return_count, br_destination) = {- let frame = &mut stack.control_stack[i];+ let frame = &mut environ.stacks.control_stack[i];// We signal that all the code that follows until the next End is unreachableframe.set_branched_to_exit();let return_count = if frame.is_loop() {@@ -469,12 +476,12 @@ pub fn translate_operator(};(return_count, frame.br_destination())};- let destination_args = stack.peekn_mut(return_count);+ let destination_args = environ.stacks.peekn_mut(return_count);canonicalise_then_jump(builder, br_destination, destination_args);- stack.popn(return_count);- stack.reachable = false;+ environ.stacks.popn(return_count);+ environ.stacks.reachable = false;}- Operator::BrIf { relative_depth } => translate_br_if(*relative_depth, builder, stack),+ Operator::BrIf { relative_depth } => translate_br_if(*relative_depth, builder, environ),Operator::BrTable { targets } => {let default = targets.default();let mut min_depth = default;@@ -485,31 +492,31 @@ pub fn translate_operator(}}let jump_args_count = {- let i = stack.control_stack.len() - 1 - (min_depth as usize);- let min_depth_frame = &stack.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - (min_depth as usize);+ let min_depth_frame = &environ.stacks.control_stack[i];if min_depth_frame.is_loop() {min_depth_frame.num_param_values()} else {min_depth_frame.num_return_values()}};- let val = stack.pop1();+ let val = environ.stacks.pop1();let mut data = Vec::with_capacity(targets.len() as usize);if jump_args_count == 0 {// No jump argumentsfor depth in targets.targets() {let depth = depth?;let block = {- let i = stack.control_stack.len() - 1 - (depth as usize);- let frame = &mut stack.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - (depth as usize);+ let frame = &mut environ.stacks.control_stack[i];frame.set_branched_to_exit();frame.br_destination()};data.push(builder.func.dfg.block_call(block, &[]));}let block = {- let i = stack.control_stack.len() - 1 - (default as usize);- let frame = &mut stack.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - (default as usize);+ let frame = &mut environ.stacks.control_stack[i];frame.set_branched_to_exit();frame.br_destination()};@@ -549,31 +556,31 @@ pub fn translate_operator(builder.switch_to_block(dest_block);builder.seal_block(dest_block);let real_dest_block = {- let i = stack.control_stack.len() - 1 - depth;- let frame = &mut stack.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - depth;+ let frame = &mut environ.stacks.control_stack[i];frame.set_branched_to_exit();frame.br_destination()};- let destination_args = stack.peekn_mut(return_count);+ let destination_args = environ.stacks.peekn_mut(return_count);canonicalise_then_jump(builder, real_dest_block, destination_args);}- stack.popn(return_count);+ environ.stacks.popn(return_count);}- stack.reachable = false;+ environ.stacks.reachable = false;}Operator::Return => {let return_count = {- let frame = &mut stack.control_stack[0];+ let frame = &mut environ.stacks.control_stack[0];frame.num_return_values()};{- let return_args = stack.peekn_mut(return_count);+ let mut return_args = environ.stacks.peekn(return_count).to_vec();environ.handle_before_return(&return_args, builder);- bitcast_wasm_returns(return_args, builder);- builder.ins().return_(return_args);+ bitcast_wasm_returns(&mut return_args, builder);+ builder.ins().return_(&return_args);}- stack.popn(return_count);- stack.reachable = false;+ environ.stacks.popn(return_count);+ environ.stacks.reachable = false;}/********************************** Exception handling **********************************/Operator::Catch { .. }@@ -599,7 +606,7 @@ pub fn translate_operator(// equivalent of `br` to the target (unboxing the exnref// into stack values or pushing it directly, depending on// the kind of clause).- let ckpt = stack.handlers.take_checkpoint();+ let ckpt = environ.stacks.handlers.take_checkpoint();let mut catch_blocks = vec![];// Process in *reverse* order: see the comment on// [`HandlerState`]. In brief, this allows us to unify the@@ -609,10 +616,16 @@ pub fn translate_operator(for catch in try_table.catches.iter().rev() {// This will register the block in `state.handlers`// under the appropriate tag.- catch_blocks.push(create_catch_block(builder, stack, catch, environ)?);+ catch_blocks.push(create_catch_block(builder, catch, environ)?);}- stack.push_try_table_block(next, catch_blocks, params.len(), results.len(), ckpt);+ environ.stacks.push_try_table_block(+ next,+ catch_blocks,+ params.len(),+ results.len(),+ ckpt,+ );// Continue codegen into the main body block.builder.switch_to_block(body);@@ -621,16 +634,16 @@ pub fn translate_operator(Operator::Throw { tag_index } => {let tag_index = TagIndex::from_u32(*tag_index);let arity = environ.tag_param_arity(tag_index);- let args = stack.peekn(arity);- environ.translate_exn_throw(builder, tag_index, args, stack.handlers.handlers())?;- stack.popn(arity);- stack.reachable = false;+ let args = environ.stacks.peekn(arity).to_vec();+ environ.translate_exn_throw(builder, tag_index, &args)?;+ environ.stacks.popn(arity);+ environ.stacks.reachable = false;}Operator::ThrowRef => {- let exnref = stack.pop1();- environ.translate_exn_throw_ref(builder, exnref, stack.handlers.handlers())?;- stack.reachable = false;+ let exnref = environ.stacks.pop1();+ environ.translate_exn_throw_ref(builder, exnref)?;+ environ.stacks.reachable = false;}/************************************ Calls ****************************************@@ -647,27 +660,19 @@ pub fn translate_operator(let num_args = environ.num_params_for_func(function_index);// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sig_ref, args, builder);- let args = stack.peekn(num_args); // Re-borrow immutably.+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sig_ref, &mut args, builder);- let inst_results = environ.translate_call(- builder,- stack,- srcloc,- function_index,- sig_ref,- args,- stack.handlers.handlers(),- )?;+ let inst_results =+ environ.translate_call(builder, srcloc, function_index, sig_ref, &args)?;debug_assert_eq!(inst_results.len(),builder.func.dfg.signatures[sig_ref].returns.len(),"translate_call results should match the call signature");- stack.popn(num_args);- stack.pushn(&inst_results);+ environ.stacks.popn(num_args);+ environ.stacks.pushn(&inst_results);}Operator::CallIndirect {type_index,@@ -679,28 +684,26 @@ pub fn translate_operator(let type_index = TypeIndex::from_u32(*type_index);let sigref = environ.get_or_create_sig_ref(builder.func, type_index);let num_args = environ.num_params_for_function_type(type_index);- let callee = stack.pop1();+ let callee = environ.stacks.pop1();// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sigref, args, builder);+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sigref, &mut args, builder);let inst_results = environ.translate_call_indirect(builder,- stack,srcloc,validator.features(),TableIndex::from_u32(*table_index),type_index,sigref,callee,- stack.peekn(num_args),- stack.handlers.handlers(),+ &args,)?;let inst_results = match inst_results {Some(results) => results,None => {- stack.reachable = false;+ environ.stacks.reachable = false;return Ok(());}};@@ -710,8 +713,8 @@ pub fn translate_operator(builder.func.dfg.signatures[sigref].returns.len(),"translate_call_indirect results should match the call signature");- stack.popn(num_args);- stack.pushn(&inst_results);+ environ.stacks.popn(num_args);+ environ.stacks.pushn(&inst_results);}/******************************* Tail Calls ******************************************* The tail call instructions pop their arguments from the stack and@@ -729,14 +732,13 @@ pub fn translate_operator(let num_args = environ.num_params_for_func(function_index);// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sig_ref, args, builder);- let args = stack.peekn(num_args); // Reborrow immutably.+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sig_ref, &mut args, builder);- environ.translate_return_call(builder, stack, srcloc, function_index, sig_ref, args)?;+ environ.translate_return_call(builder, srcloc, function_index, sig_ref, &args)?;- stack.popn(num_args);- stack.reachable = false;+ environ.stacks.popn(num_args);+ environ.stacks.reachable = false;}Operator::ReturnCallIndirect {type_index,@@ -748,26 +750,25 @@ pub fn translate_operator(let type_index = TypeIndex::from_u32(*type_index);let sigref = environ.get_or_create_sig_ref(builder.func, type_index);let num_args = environ.num_params_for_function_type(type_index);- let callee = stack.pop1();+ let callee = environ.stacks.pop1();// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sigref, args, builder);+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sigref, &mut args, builder);environ.translate_return_call_indirect(builder,- stack,srcloc,validator.features(),TableIndex::from_u32(*table_index),type_index,sigref,callee,- stack.peekn(num_args),+ &args,)?;- stack.popn(num_args);- stack.reachable = false;+ environ.stacks.popn(num_args);+ environ.stacks.reachable = false;}Operator::ReturnCallRef { type_index } => {// Get function signature@@ -776,23 +777,16 @@ pub fn translate_operator(let type_index = TypeIndex::from_u32(*type_index);let sigref = environ.get_or_create_sig_ref(builder.func, type_index);let num_args = environ.num_params_for_function_type(type_index);- let callee = stack.pop1();+ let callee = environ.stacks.pop1();// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sigref, args, builder);+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sigref, &mut args, builder);- environ.translate_return_call_ref(- builder,- stack,- srcloc,- sigref,- callee,- stack.peekn(num_args),- )?;+ environ.translate_return_call_ref(builder, srcloc, sigref, callee, &args)?;- stack.popn(num_args);- stack.reachable = false;+ environ.stacks.popn(num_args);+ environ.stacks.reachable = false;}/******************************* Memory management ************************************ Memory management is handled by environment. It is usually translated into calls to@@ -803,14 +797,16 @@ pub fn translate_operator(// argument to be a memory index.let mem = MemoryIndex::from_u32(*mem);let _heap = environ.get_or_create_heap(builder.func, mem);- let val = stack.pop1();+ let val = environ.stacks.pop1();environ.before_memory_grow(builder, val, mem);- stack.push1(environ.translate_memory_grow(builder, mem, val)?)+ let result = environ.translate_memory_grow(builder, mem, val)?;+ environ.stacks.push1(result);}Operator::MemorySize { mem } => {let mem = MemoryIndex::from_u32(*mem);let _heap = environ.get_or_create_heap(builder.func, mem);- stack.push1(environ.translate_memory_size(builder.cursor(), mem)?);+ let result = environ.translate_memory_size(builder.cursor(), mem)?;+ environ.stacks.push1(result);}/******************************* Load instructions ************************************ Wasm specifies an integer alignment flag but we drop it in Cranelift.@@ -818,142 +814,142 @@ pub fn translate_operator(************************************************************************************/Operator::I32Load8U { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Uload8, I32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Uload8, I32, builder, environ)?);}Operator::I32Load16U { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Uload16, I32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Uload16, I32, builder, environ)?);}Operator::I32Load8S { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Sload8, I32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Sload8, I32, builder, environ)?);}Operator::I32Load16S { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Sload16, I32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Sload16, I32, builder, environ)?);}Operator::I64Load8U { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Uload8, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Uload8, I64, builder, environ)?);}Operator::I64Load16U { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Uload16, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Uload16, I64, builder, environ)?);}Operator::I64Load8S { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Sload8, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Sload8, I64, builder, environ)?);}Operator::I64Load16S { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Sload16, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Sload16, I64, builder, environ)?);}Operator::I64Load32S { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Sload32, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Sload32, I64, builder, environ)?);}Operator::I64Load32U { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Uload32, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Uload32, I64, builder, environ)?);}Operator::I32Load { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Load, I32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Load, I32, builder, environ)?);}Operator::F32Load { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Load, F32, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Load, F32, builder, environ)?);}Operator::I64Load { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Load, I64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Load, I64, builder, environ)?);}Operator::F64Load { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Load, F64, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Load, F64, builder, environ)?);}Operator::V128Load { memarg } => {unwrap_or_return_unreachable_state!(- stack,- translate_load(memarg, ir::Opcode::Load, I8X16, builder, stack, environ)?+ environ,+ translate_load(memarg, ir::Opcode::Load, I8X16, builder, environ)?);}Operator::V128Load8x8S { memarg } => {//TODO(#6829): add before_load() and before_store() hooks for SIMD loads and stores.let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().sload8x8(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}Operator::V128Load8x8U { memarg } => {let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().uload8x8(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}Operator::V128Load16x4S { memarg } => {let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().sload16x4(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}Operator::V128Load16x4U { memarg } => {let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().uload16x4(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}Operator::V128Load32x2S { memarg } => {let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().sload32x2(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}Operator::V128Load32x2U { memarg } => {let (flags, _, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, 8, builder, stack, environ)?+ environ,+ prepare_addr(memarg, 8, builder, environ)?);let loaded = builder.ins().uload32x2(flags, base, 0);- stack.push1(loaded);+ environ.stacks.push1(loaded);}/****************************** Store instructions ************************************ Wasm specifies an integer alignment flag but we drop it in Cranelift.@@ -963,347 +959,388 @@ pub fn translate_operator(| Operator::I64Store { memarg }| Operator::F32Store { memarg }| Operator::F64Store { memarg } => {- translate_store(memarg, ir::Opcode::Store, builder, stack, environ)?;+ translate_store(memarg, ir::Opcode::Store, builder, environ)?;}Operator::I32Store8 { memarg } | Operator::I64Store8 { memarg } => {- translate_store(memarg, ir::Opcode::Istore8, builder, stack, environ)?;+ translate_store(memarg, ir::Opcode::Istore8, builder, environ)?;}Operator::I32Store16 { memarg } | Operator::I64Store16 { memarg } => {- translate_store(memarg, ir::Opcode::Istore16, builder, stack, environ)?;+ translate_store(memarg, ir::Opcode::Istore16, builder, environ)?;}Operator::I64Store32 { memarg } => {- translate_store(memarg, ir::Opcode::Istore32, builder, stack, environ)?;+ translate_store(memarg, ir::Opcode::Istore32, builder, environ)?;}Operator::V128Store { memarg } => {- translate_store(memarg, ir::Opcode::Store, builder, stack, environ)?;+ translate_store(memarg, ir::Opcode::Store, builder, environ)?;}/****************************** Nullary Operators ************************************/Operator::I32Const { value } => {- stack.push1(builder.ins().iconst(I32, i64::from(value.cast_unsigned())));+ environ+ .stacks+ .push1(builder.ins().iconst(I32, i64::from(value.cast_unsigned())));}- Operator::I64Const { value } => stack.push1(builder.ins().iconst(I64, *value)),+ Operator::I64Const { value } => environ.stacks.push1(builder.ins().iconst(I64, *value)),Operator::F32Const { value } => {- stack.push1(builder.ins().f32const(f32_translation(*value)));+ environ+ .stacks+ .push1(builder.ins().f32const(f32_translation(*value)));}Operator::F64Const { value } => {- stack.push1(builder.ins().f64const(f64_translation(*value)));+ environ+ .stacks+ .push1(builder.ins().f64const(f64_translation(*value)));}/******************************* Unary Operators *************************************/Operator::I32Clz | Operator::I64Clz => {- let arg = stack.pop1();- stack.push1(builder.ins().clz(arg));+ let arg = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().clz(arg));}Operator::I32Ctz | Operator::I64Ctz => {- let arg = stack.pop1();- stack.push1(builder.ins().ctz(arg));+ let arg = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ctz(arg));}Operator::I32Popcnt | Operator::I64Popcnt => {- let arg = stack.pop1();- stack.push1(builder.ins().popcnt(arg));+ let arg = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().popcnt(arg));}Operator::I64ExtendI32S => {- let val = stack.pop1();- stack.push1(builder.ins().sextend(I64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I64, val));}Operator::I64ExtendI32U => {- let val = stack.pop1();- stack.push1(builder.ins().uextend(I64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().uextend(I64, val));}Operator::I32WrapI64 => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I32, val));}Operator::F32Sqrt | Operator::F64Sqrt => {- let arg = stack.pop1();- stack.push1(builder.ins().sqrt(arg));+ let arg = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sqrt(arg));}Operator::F32Ceil => {- let arg = stack.pop1();- stack.push1(environ.ceil_f32(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.ceil_f32(builder, arg);+ environ.stacks.push1(result);}Operator::F64Ceil => {- let arg = stack.pop1();- stack.push1(environ.ceil_f64(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.ceil_f64(builder, arg);+ environ.stacks.push1(result);}Operator::F32Floor => {- let arg = stack.pop1();- stack.push1(environ.floor_f32(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.floor_f32(builder, arg);+ environ.stacks.push1(result);}Operator::F64Floor => {- let arg = stack.pop1();- stack.push1(environ.floor_f64(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.floor_f64(builder, arg);+ environ.stacks.push1(result);}Operator::F32Trunc => {- let arg = stack.pop1();- stack.push1(environ.trunc_f32(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.trunc_f32(builder, arg);+ environ.stacks.push1(result);}Operator::F64Trunc => {- let arg = stack.pop1();- stack.push1(environ.trunc_f64(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.trunc_f64(builder, arg);+ environ.stacks.push1(result);}Operator::F32Nearest => {- let arg = stack.pop1();- stack.push1(environ.nearest_f32(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.nearest_f32(builder, arg);+ environ.stacks.push1(result);}Operator::F64Nearest => {- let arg = stack.pop1();- stack.push1(environ.nearest_f64(builder, arg));+ let arg = environ.stacks.pop1();+ let result = environ.nearest_f64(builder, arg);+ environ.stacks.push1(result);}Operator::F32Abs | Operator::F64Abs => {- let val = stack.pop1();- stack.push1(builder.ins().fabs(val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fabs(val));}Operator::F32Neg | Operator::F64Neg => {- let arg = stack.pop1();- stack.push1(builder.ins().fneg(arg));+ let arg = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fneg(arg));}Operator::F64ConvertI64U | Operator::F64ConvertI32U => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_from_uint(F64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fcvt_from_uint(F64, val));}Operator::F64ConvertI64S | Operator::F64ConvertI32S => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_from_sint(F64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fcvt_from_sint(F64, val));}Operator::F32ConvertI64S | Operator::F32ConvertI32S => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_from_sint(F32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fcvt_from_sint(F32, val));}Operator::F32ConvertI64U | Operator::F32ConvertI32U => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_from_uint(F32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fcvt_from_uint(F32, val));}Operator::F64PromoteF32 => {- let val = stack.pop1();- stack.push1(builder.ins().fpromote(F64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fpromote(F64, val));}Operator::F32DemoteF64 => {- let val = stack.pop1();- stack.push1(builder.ins().fdemote(F32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().fdemote(F32, val));}Operator::I64TruncF64S | Operator::I64TruncF32S => {- let val = stack.pop1();- stack.push1(environ.translate_fcvt_to_sint(builder, I64, val));+ let val = environ.stacks.pop1();+ let result = environ.translate_fcvt_to_sint(builder, I64, val);+ environ.stacks.push1(result);}Operator::I32TruncF64S | Operator::I32TruncF32S => {- let val = stack.pop1();- stack.push1(environ.translate_fcvt_to_sint(builder, I32, val));+ let val = environ.stacks.pop1();+ let result = environ.translate_fcvt_to_sint(builder, I32, val);+ environ.stacks.push1(result);}Operator::I64TruncF64U | Operator::I64TruncF32U => {- let val = stack.pop1();- stack.push1(environ.translate_fcvt_to_uint(builder, I64, val));+ let val = environ.stacks.pop1();+ let result = environ.translate_fcvt_to_uint(builder, I64, val);+ environ.stacks.push1(result);}Operator::I32TruncF64U | Operator::I32TruncF32U => {- let val = stack.pop1();- stack.push1(environ.translate_fcvt_to_uint(builder, I32, val));+ let val = environ.stacks.pop1();+ let result = environ.translate_fcvt_to_uint(builder, I32, val);+ environ.stacks.push1(result);}Operator::I64TruncSatF64S | Operator::I64TruncSatF32S => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_to_sint_sat(I64, val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().fcvt_to_sint_sat(I64, val));}Operator::I32TruncSatF64S | Operator::I32TruncSatF32S => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_to_sint_sat(I32, val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().fcvt_to_sint_sat(I32, val));}Operator::I64TruncSatF64U | Operator::I64TruncSatF32U => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_to_uint_sat(I64, val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().fcvt_to_uint_sat(I64, val));}Operator::I32TruncSatF64U | Operator::I32TruncSatF32U => {- let val = stack.pop1();- stack.push1(builder.ins().fcvt_to_uint_sat(I32, val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().fcvt_to_uint_sat(I32, val));}Operator::F32ReinterpretI32 => {- let val = stack.pop1();- stack.push1(builder.ins().bitcast(F32, MemFlags::new(), val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().bitcast(F32, MemFlags::new(), val));}Operator::F64ReinterpretI64 => {- let val = stack.pop1();- stack.push1(builder.ins().bitcast(F64, MemFlags::new(), val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().bitcast(F64, MemFlags::new(), val));}Operator::I32ReinterpretF32 => {- let val = stack.pop1();- stack.push1(builder.ins().bitcast(I32, MemFlags::new(), val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().bitcast(I32, MemFlags::new(), val));}Operator::I64ReinterpretF64 => {- let val = stack.pop1();- stack.push1(builder.ins().bitcast(I64, MemFlags::new(), val));+ let val = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().bitcast(I64, MemFlags::new(), val));}Operator::I32Extend8S => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I8, val));- let val = stack.pop1();- stack.push1(builder.ins().sextend(I32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I8, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I32, val));}Operator::I32Extend16S => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I16, val));- let val = stack.pop1();- stack.push1(builder.ins().sextend(I32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I16, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I32, val));}Operator::I64Extend8S => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I8, val));- let val = stack.pop1();- stack.push1(builder.ins().sextend(I64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I8, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I64, val));}Operator::I64Extend16S => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I16, val));- let val = stack.pop1();- stack.push1(builder.ins().sextend(I64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I16, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I64, val));}Operator::I64Extend32S => {- let val = stack.pop1();- stack.push1(builder.ins().ireduce(I32, val));- let val = stack.pop1();- stack.push1(builder.ins().sextend(I64, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().ireduce(I32, val));+ let val = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().sextend(I64, val));}/****************************** Binary Operators ************************************/Operator::I32Add | Operator::I64Add => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().iadd(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().iadd(arg1, arg2));}Operator::I32And | Operator::I64And => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().band(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().band(arg1, arg2));}Operator::I32Or | Operator::I64Or => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().bor(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().bor(arg1, arg2));}Operator::I32Xor | Operator::I64Xor => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().bxor(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().bxor(arg1, arg2));}Operator::I32Shl | Operator::I64Shl => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().ishl(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().ishl(arg1, arg2));}Operator::I32ShrS | Operator::I64ShrS => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().sshr(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().sshr(arg1, arg2));}Operator::I32ShrU | Operator::I64ShrU => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().ushr(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().ushr(arg1, arg2));}Operator::I32Rotl | Operator::I64Rotl => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().rotl(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().rotl(arg1, arg2));}Operator::I32Rotr | Operator::I64Rotr => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().rotr(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().rotr(arg1, arg2));}Operator::F32Add | Operator::F64Add => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fadd(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fadd(arg1, arg2));}Operator::I32Sub | Operator::I64Sub => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().isub(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().isub(arg1, arg2));}Operator::F32Sub | Operator::F64Sub => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fsub(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fsub(arg1, arg2));}Operator::I32Mul | Operator::I64Mul => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().imul(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().imul(arg1, arg2));}Operator::F32Mul | Operator::F64Mul => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fmul(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fmul(arg1, arg2));}Operator::F32Div | Operator::F64Div => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fdiv(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fdiv(arg1, arg2));}Operator::I32DivS | Operator::I64DivS => {- let (arg1, arg2) = stack.pop2();- stack.push1(environ.translate_sdiv(builder, arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ let result = environ.translate_sdiv(builder, arg1, arg2);+ environ.stacks.push1(result);}Operator::I32DivU | Operator::I64DivU => {- let (arg1, arg2) = stack.pop2();- stack.push1(environ.translate_udiv(builder, arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ let result = environ.translate_udiv(builder, arg1, arg2);+ environ.stacks.push1(result);}Operator::I32RemS | Operator::I64RemS => {- let (arg1, arg2) = stack.pop2();- stack.push1(environ.translate_srem(builder, arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ let result = environ.translate_srem(builder, arg1, arg2);+ environ.stacks.push1(result);}Operator::I32RemU | Operator::I64RemU => {- let (arg1, arg2) = stack.pop2();- stack.push1(environ.translate_urem(builder, arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ let result = environ.translate_urem(builder, arg1, arg2);+ environ.stacks.push1(result);}Operator::F32Min | Operator::F64Min => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fmin(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fmin(arg1, arg2));}Operator::F32Max | Operator::F64Max => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fmax(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fmax(arg1, arg2));}Operator::F32Copysign | Operator::F64Copysign => {- let (arg1, arg2) = stack.pop2();- stack.push1(builder.ins().fcopysign(arg1, arg2));+ let (arg1, arg2) = environ.stacks.pop2();+ environ.stacks.push1(builder.ins().fcopysign(arg1, arg2));}/**************************** Comparison Operators **********************************/Operator::I32LtS | Operator::I64LtS => {- translate_icmp(IntCC::SignedLessThan, builder, stack)+ translate_icmp(IntCC::SignedLessThan, builder, environ)}Operator::I32LtU | Operator::I64LtU => {- translate_icmp(IntCC::UnsignedLessThan, builder, stack)+ translate_icmp(IntCC::UnsignedLessThan, builder, environ)}Operator::I32LeS | Operator::I64LeS => {- translate_icmp(IntCC::SignedLessThanOrEqual, builder, stack)+ translate_icmp(IntCC::SignedLessThanOrEqual, builder, environ)}Operator::I32LeU | Operator::I64LeU => {- translate_icmp(IntCC::UnsignedLessThanOrEqual, builder, stack)+ translate_icmp(IntCC::UnsignedLessThanOrEqual, builder, environ)}Operator::I32GtS | Operator::I64GtS => {- translate_icmp(IntCC::SignedGreaterThan, builder, stack)+ translate_icmp(IntCC::SignedGreaterThan, builder, environ)}Operator::I32GtU | Operator::I64GtU => {- translate_icmp(IntCC::UnsignedGreaterThan, builder, stack)+ translate_icmp(IntCC::UnsignedGreaterThan, builder, environ)}Operator::I32GeS | Operator::I64GeS => {- translate_icmp(IntCC::SignedGreaterThanOrEqual, builder, stack)+ translate_icmp(IntCC::SignedGreaterThanOrEqual, builder, environ)}Operator::I32GeU | Operator::I64GeU => {- translate_icmp(IntCC::UnsignedGreaterThanOrEqual, builder, stack)+ translate_icmp(IntCC::UnsignedGreaterThanOrEqual, builder, environ)}Operator::I32Eqz | Operator::I64Eqz => {- let arg = stack.pop1();+ let arg = environ.stacks.pop1();let val = builder.ins().icmp_imm(IntCC::Equal, arg, 0);- stack.push1(builder.ins().uextend(I32, val));+ environ.stacks.push1(builder.ins().uextend(I32, val));}- Operator::I32Eq | Operator::I64Eq => translate_icmp(IntCC::Equal, builder, stack),- Operator::F32Eq | Operator::F64Eq => translate_fcmp(FloatCC::Equal, builder, stack),- Operator::I32Ne | Operator::I64Ne => translate_icmp(IntCC::NotEqual, builder, stack),- Operator::F32Ne | Operator::F64Ne => translate_fcmp(FloatCC::NotEqual, builder, stack),- Operator::F32Gt | Operator::F64Gt => translate_fcmp(FloatCC::GreaterThan, builder, stack),+ Operator::I32Eq | Operator::I64Eq => translate_icmp(IntCC::Equal, builder, environ),+ Operator::F32Eq | Operator::F64Eq => translate_fcmp(FloatCC::Equal, builder, environ),+ Operator::I32Ne | Operator::I64Ne => translate_icmp(IntCC::NotEqual, builder, environ),+ Operator::F32Ne | Operator::F64Ne => translate_fcmp(FloatCC::NotEqual, builder, environ),+ Operator::F32Gt | Operator::F64Gt => translate_fcmp(FloatCC::GreaterThan, builder, environ),Operator::F32Ge | Operator::F64Ge => {- translate_fcmp(FloatCC::GreaterThanOrEqual, builder, stack)+ translate_fcmp(FloatCC::GreaterThanOrEqual, builder, environ)}- Operator::F32Lt | Operator::F64Lt => translate_fcmp(FloatCC::LessThan, builder, stack),+ Operator::F32Lt | Operator::F64Lt => translate_fcmp(FloatCC::LessThan, builder, environ),Operator::F32Le | Operator::F64Le => {- translate_fcmp(FloatCC::LessThanOrEqual, builder, stack)+ translate_fcmp(FloatCC::LessThanOrEqual, builder, environ)}Operator::RefNull { hty } => {let hty = environ.convert_heap_type(*hty)?;- stack.push1(environ.translate_ref_null(builder.cursor(), hty)?)+ let result = environ.translate_ref_null(builder.cursor(), hty)?;+ environ.stacks.push1(result);}Operator::RefIsNull => {- let value = stack.pop1();+ let value = environ.stacks.pop1();let [WasmValType::Ref(ty)] = operand_types else {unreachable!("validation")};- stack.push1(environ.translate_ref_is_null(builder.cursor(), value, *ty)?);+ let result = environ.translate_ref_is_null(builder.cursor(), value, *ty)?;+ environ.stacks.push1(result);}Operator::RefFunc { function_index } => {let index = FuncIndex::from_u32(*function_index);- stack.push1(environ.translate_ref_func(builder.cursor(), index)?);+ let result = environ.translate_ref_func(builder.cursor(), index)?;+ environ.stacks.push1(result);}Operator::MemoryAtomicWait32 { memarg } | Operator::MemoryAtomicWait64 { memarg } => {// The WebAssembly MVP only supports one linear memory and@@ -1316,10 +1353,10 @@ pub fn translate_operator(};let memory_index = MemoryIndex::from_u32(memarg.memory);let heap = environ.get_or_create_heap(builder.func, memory_index);- let timeout = stack.pop1(); // 64 (fixed)- let expected = stack.pop1(); // 32 or 64 (per the `Ixx` in `IxxAtomicWait`)+ let timeout = environ.stacks.pop1(); // 64 (fixed)+ let expected = environ.stacks.pop1(); // 32 or 64 (per the `Ixx` in `IxxAtomicWait`)assert!(builder.func.dfg.value_type(expected) == implied_ty);- let addr = stack.pop1();+ let addr = environ.stacks.pop1();let effective_addr = if memarg.offset == 0 {addr} else {@@ -1337,13 +1374,13 @@ pub fn translate_operator(expected,timeout,)?;- stack.push1(res);+ environ.stacks.push1(res);}Operator::MemoryAtomicNotify { memarg } => {let memory_index = MemoryIndex::from_u32(memarg.memory);let heap = environ.get_or_create_heap(builder.func, memory_index);- let count = stack.pop1(); // 32 (fixed)- let addr = stack.pop1();+ let count = environ.stacks.pop1(); // 32 (fixed)+ let addr = environ.stacks.pop1();let effective_addr = if memarg.offset == 0 {addr} else {@@ -1358,204 +1395,204 @@ pub fn translate_operator(effective_addr,count,)?;- stack.push1(res);+ environ.stacks.push1(res);}Operator::I32AtomicLoad { memarg } => {- translate_atomic_load(I32, I32, memarg, builder, stack, environ)?+ translate_atomic_load(I32, I32, memarg, builder, environ)?}Operator::I64AtomicLoad { memarg } => {- translate_atomic_load(I64, I64, memarg, builder, stack, environ)?+ translate_atomic_load(I64, I64, memarg, builder, environ)?}Operator::I32AtomicLoad8U { memarg } => {- translate_atomic_load(I32, I8, memarg, builder, stack, environ)?+ translate_atomic_load(I32, I8, memarg, builder, environ)?}Operator::I32AtomicLoad16U { memarg } => {- translate_atomic_load(I32, I16, memarg, builder, stack, environ)?+ translate_atomic_load(I32, I16, memarg, builder, environ)?}Operator::I64AtomicLoad8U { memarg } => {- translate_atomic_load(I64, I8, memarg, builder, stack, environ)?+ translate_atomic_load(I64, I8, memarg, builder, environ)?}Operator::I64AtomicLoad16U { memarg } => {- translate_atomic_load(I64, I16, memarg, builder, stack, environ)?+ translate_atomic_load(I64, I16, memarg, builder, environ)?}Operator::I64AtomicLoad32U { memarg } => {- translate_atomic_load(I64, I32, memarg, builder, stack, environ)?+ translate_atomic_load(I64, I32, memarg, builder, environ)?}Operator::I32AtomicStore { memarg } => {- translate_atomic_store(I32, memarg, builder, stack, environ)?+ translate_atomic_store(I32, memarg, builder, environ)?}Operator::I64AtomicStore { memarg } => {- translate_atomic_store(I64, memarg, builder, stack, environ)?+ translate_atomic_store(I64, memarg, builder, environ)?}Operator::I32AtomicStore8 { memarg } => {- translate_atomic_store(I8, memarg, builder, stack, environ)?+ translate_atomic_store(I8, memarg, builder, environ)?}Operator::I32AtomicStore16 { memarg } => {- translate_atomic_store(I16, memarg, builder, stack, environ)?+ translate_atomic_store(I16, memarg, builder, environ)?}Operator::I64AtomicStore8 { memarg } => {- translate_atomic_store(I8, memarg, builder, stack, environ)?+ translate_atomic_store(I8, memarg, builder, environ)?}Operator::I64AtomicStore16 { memarg } => {- translate_atomic_store(I16, memarg, builder, stack, environ)?+ translate_atomic_store(I16, memarg, builder, environ)?}Operator::I64AtomicStore32 { memarg } => {- translate_atomic_store(I32, memarg, builder, stack, environ)?+ translate_atomic_store(I32, memarg, builder, environ)?}Operator::I32AtomicRmwAdd { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I64AtomicRmwAdd { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I32AtomicRmw8AddU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I32AtomicRmw16AddU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I64AtomicRmw8AddU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I64AtomicRmw16AddU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I64AtomicRmw32AddU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::Add, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::Add, memarg, builder, environ)?}Operator::I32AtomicRmwSub { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I64AtomicRmwSub { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I32AtomicRmw8SubU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I32AtomicRmw16SubU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I64AtomicRmw8SubU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I64AtomicRmw16SubU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I64AtomicRmw32SubU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::Sub, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::Sub, memarg, builder, environ)?}Operator::I32AtomicRmwAnd { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I64AtomicRmwAnd { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I32AtomicRmw8AndU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I32AtomicRmw16AndU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I64AtomicRmw8AndU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I64AtomicRmw16AndU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I64AtomicRmw32AndU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::And, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::And, memarg, builder, environ)?}Operator::I32AtomicRmwOr { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I64AtomicRmwOr { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I32AtomicRmw8OrU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I32AtomicRmw16OrU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I64AtomicRmw8OrU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I64AtomicRmw16OrU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I64AtomicRmw32OrU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::Or, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::Or, memarg, builder, environ)?}Operator::I32AtomicRmwXor { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I64AtomicRmwXor { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I32AtomicRmw8XorU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I32AtomicRmw16XorU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I64AtomicRmw8XorU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I64AtomicRmw16XorU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I64AtomicRmw32XorU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::Xor, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::Xor, memarg, builder, environ)?}Operator::I32AtomicRmwXchg { memarg } => {- translate_atomic_rmw(I32, I32, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I32, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I64AtomicRmwXchg { memarg } => {- translate_atomic_rmw(I64, I64, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I64, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I32AtomicRmw8XchgU { memarg } => {- translate_atomic_rmw(I32, I8, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I8, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I32AtomicRmw16XchgU { memarg } => {- translate_atomic_rmw(I32, I16, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I32, I16, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I64AtomicRmw8XchgU { memarg } => {- translate_atomic_rmw(I64, I8, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I8, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I64AtomicRmw16XchgU { memarg } => {- translate_atomic_rmw(I64, I16, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I16, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I64AtomicRmw32XchgU { memarg } => {- translate_atomic_rmw(I64, I32, AtomicRmwOp::Xchg, memarg, builder, stack, environ)?+ translate_atomic_rmw(I64, I32, AtomicRmwOp::Xchg, memarg, builder, environ)?}Operator::I32AtomicRmwCmpxchg { memarg } => {- translate_atomic_cas(I32, I32, memarg, builder, stack, environ)?+ translate_atomic_cas(I32, I32, memarg, builder, environ)?}Operator::I64AtomicRmwCmpxchg { memarg } => {- translate_atomic_cas(I64, I64, memarg, builder, stack, environ)?+ translate_atomic_cas(I64, I64, memarg, builder, environ)?}Operator::I32AtomicRmw8CmpxchgU { memarg } => {- translate_atomic_cas(I32, I8, memarg, builder, stack, environ)?+ translate_atomic_cas(I32, I8, memarg, builder, environ)?}Operator::I32AtomicRmw16CmpxchgU { memarg } => {- translate_atomic_cas(I32, I16, memarg, builder, stack, environ)?+ translate_atomic_cas(I32, I16, memarg, builder, environ)?}Operator::I64AtomicRmw8CmpxchgU { memarg } => {- translate_atomic_cas(I64, I8, memarg, builder, stack, environ)?+ translate_atomic_cas(I64, I8, memarg, builder, environ)?}Operator::I64AtomicRmw16CmpxchgU { memarg } => {- translate_atomic_cas(I64, I16, memarg, builder, stack, environ)?+ translate_atomic_cas(I64, I16, memarg, builder, environ)?}Operator::I64AtomicRmw32CmpxchgU { memarg } => {- translate_atomic_cas(I64, I32, memarg, builder, stack, environ)?+ translate_atomic_cas(I64, I32, memarg, builder, environ)?}Operator::AtomicFence { .. } => {@@ -1568,59 +1605,61 @@ pub fn translate_operator(let dst_index = MemoryIndex::from_u32(*dst_mem);let _dst_heap = environ.get_or_create_heap(builder.func, dst_index);- let len = stack.pop1();- let src_pos = stack.pop1();- let dst_pos = stack.pop1();+ let len = environ.stacks.pop1();+ let src_pos = environ.stacks.pop1();+ let dst_pos = environ.stacks.pop1();environ.translate_memory_copy(builder, src_index, dst_index, dst_pos, src_pos, len)?;}Operator::MemoryFill { mem } => {let mem = MemoryIndex::from_u32(*mem);let _heap = environ.get_or_create_heap(builder.func, mem);- let len = stack.pop1();- let val = stack.pop1();- let dest = stack.pop1();+ let len = environ.stacks.pop1();+ let val = environ.stacks.pop1();+ let dest = environ.stacks.pop1();environ.translate_memory_fill(builder, mem, dest, val, len)?;}Operator::MemoryInit { data_index, mem } => {let mem = MemoryIndex::from_u32(*mem);let _heap = environ.get_or_create_heap(builder.func, mem);- let len = stack.pop1();- let src = stack.pop1();- let dest = stack.pop1();+ let len = environ.stacks.pop1();+ let src = environ.stacks.pop1();+ let dest = environ.stacks.pop1();environ.translate_memory_init(builder, mem, *data_index, dest, src, len)?;}Operator::DataDrop { data_index } => {environ.translate_data_drop(builder.cursor(), *data_index)?;}Operator::TableSize { table: index } => {- stack.push1(- environ.translate_table_size(builder.cursor(), TableIndex::from_u32(*index))?,- );+ let result =+ environ.translate_table_size(builder.cursor(), TableIndex::from_u32(*index))?;+ environ.stacks.push1(result);}Operator::TableGrow { table: index } => {let table_index = TableIndex::from_u32(*index);- let delta = stack.pop1();- let init_value = stack.pop1();- stack.push1(environ.translate_table_grow(builder, table_index, delta, init_value)?);+ let delta = environ.stacks.pop1();+ let init_value = environ.stacks.pop1();+ let result = environ.translate_table_grow(builder, table_index, delta, init_value)?;+ environ.stacks.push1(result);}Operator::TableGet { table: index } => {let table_index = TableIndex::from_u32(*index);- let index = stack.pop1();- stack.push1(environ.translate_table_get(builder, table_index, index)?);+ let index = environ.stacks.pop1();+ let result = environ.translate_table_get(builder, table_index, index)?;+ environ.stacks.push1(result);}Operator::TableSet { table: index } => {let table_index = TableIndex::from_u32(*index);- let value = stack.pop1();- let index = stack.pop1();+ let value = environ.stacks.pop1();+ let index = environ.stacks.pop1();environ.translate_table_set(builder, table_index, value, index)?;}Operator::TableCopy {dst_table: dst_table_index,src_table: src_table_index,} => {- let len = stack.pop1();- let src = stack.pop1();- let dest = stack.pop1();+ let len = environ.stacks.pop1();+ let src = environ.stacks.pop1();+ let dest = environ.stacks.pop1();environ.translate_table_copy(builder,TableIndex::from_u32(*dst_table_index),@@ -1632,18 +1671,18 @@ pub fn translate_operator(}Operator::TableFill { table } => {let table_index = TableIndex::from_u32(*table);- let len = stack.pop1();- let val = stack.pop1();- let dest = stack.pop1();+ let len = environ.stacks.pop1();+ let val = environ.stacks.pop1();+ let dest = environ.stacks.pop1();environ.translate_table_fill(builder, table_index, dest, val, len)?;}Operator::TableInit {elem_index,table: table_index,} => {- let len = stack.pop1();- let src = stack.pop1();- let dest = stack.pop1();+ let len = environ.stacks.pop1();+ let src = environ.stacks.pop1();+ let dest = environ.stacks.pop1();environ.translate_table_init(builder,*elem_index,@@ -1662,89 +1701,94 @@ pub fn translate_operator(let value = builder.ins().vconst(I8X16, handle);// the v128.const is typed in CLIF as a I8x16 but bitcast to a different type// before use- stack.push1(value)+ environ.stacks.push1(value)}Operator::I8x16Splat | Operator::I16x8Splat => {- let reduced = builder.ins().ireduce(type_of(op).lane_type(), stack.pop1());+ let reduced = builder+ .ins()+ .ireduce(type_of(op).lane_type(), environ.stacks.pop1());let splatted = builder.ins().splat(type_of(op), reduced);- stack.push1(splatted)+ environ.stacks.push1(splatted)}Operator::I32x4Splat| Operator::I64x2Splat| Operator::F32x4Splat| Operator::F64x2Splat => {- let splatted = builder.ins().splat(type_of(op), stack.pop1());- stack.push1(splatted)+ let splatted = builder.ins().splat(type_of(op), environ.stacks.pop1());+ environ.stacks.push1(splatted)}Operator::V128Load8Splat { memarg }| Operator::V128Load16Splat { memarg }| Operator::V128Load32Splat { memarg }| Operator::V128Load64Splat { memarg } => {unwrap_or_return_unreachable_state!(- stack,+ environ,translate_load(memarg,ir::Opcode::Load,type_of(op).lane_type(),builder,- stack,environ,)?);- let splatted = builder.ins().splat(type_of(op), stack.pop1());- stack.push1(splatted)+ let splatted = builder.ins().splat(type_of(op), environ.stacks.pop1());+ environ.stacks.push1(splatted)}Operator::V128Load32Zero { memarg } | Operator::V128Load64Zero { memarg } => {unwrap_or_return_unreachable_state!(- stack,+ environ,translate_load(memarg,ir::Opcode::Load,type_of(op).lane_type(),builder,- stack,environ,)?);- let as_vector = builder.ins().scalar_to_vector(type_of(op), stack.pop1());- stack.push1(as_vector)+ let as_vector = builder+ .ins()+ .scalar_to_vector(type_of(op), environ.stacks.pop1());+ environ.stacks.push1(as_vector)}Operator::V128Load8Lane { memarg, lane }| Operator::V128Load16Lane { memarg, lane }| Operator::V128Load32Lane { memarg, lane }| Operator::V128Load64Lane { memarg, lane } => {- let vector = pop1_with_bitcast(stack, type_of(op), builder);+ let vector = pop1_with_bitcast(environ, type_of(op), builder);unwrap_or_return_unreachable_state!(- stack,+ environ,translate_load(memarg,ir::Opcode::Load,type_of(op).lane_type(),builder,- stack,environ,)?);- let replacement = stack.pop1();- stack.push1(builder.ins().insertlane(vector, replacement, *lane))+ let replacement = environ.stacks.pop1();+ environ+ .stacks+ .push1(builder.ins().insertlane(vector, replacement, *lane))}Operator::V128Store8Lane { memarg, lane }| Operator::V128Store16Lane { memarg, lane }| Operator::V128Store32Lane { memarg, lane }| Operator::V128Store64Lane { memarg, lane } => {- let vector = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().extractlane(vector, *lane));- translate_store(memarg, ir::Opcode::Store, builder, stack, environ)?;+ let vector = pop1_with_bitcast(environ, type_of(op), builder);+ environ+ .stacks+ .push1(builder.ins().extractlane(vector, *lane));+ translate_store(memarg, ir::Opcode::Store, builder, environ)?;}Operator::I8x16ExtractLaneS { lane } | Operator::I16x8ExtractLaneS { lane } => {- let vector = pop1_with_bitcast(stack, type_of(op), builder);+ let vector = pop1_with_bitcast(environ, type_of(op), builder);let extracted = builder.ins().extractlane(vector, *lane);- stack.push1(builder.ins().sextend(I32, extracted))+ environ.stacks.push1(builder.ins().sextend(I32, extracted))}Operator::I8x16ExtractLaneU { lane } | Operator::I16x8ExtractLaneU { lane } => {- let vector = pop1_with_bitcast(stack, type_of(op), builder);+ let vector = pop1_with_bitcast(environ, type_of(op), builder);let extracted = builder.ins().extractlane(vector, *lane);- stack.push1(builder.ins().uextend(I32, extracted));+ environ.stacks.push1(builder.ins().uextend(I32, extracted));// On x86, PEXTRB zeroes the upper bits of the destination register of extractlane so// uextend could be elided; for now, uextend is needed for Cranelift's type checks to// work.@@ -1753,233 +1797,253 @@ pub fn translate_operator(| Operator::I64x2ExtractLane { lane }| Operator::F32x4ExtractLane { lane }| Operator::F64x2ExtractLane { lane } => {- let vector = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().extractlane(vector, *lane))+ let vector = pop1_with_bitcast(environ, type_of(op), builder);+ environ+ .stacks+ .push1(builder.ins().extractlane(vector, *lane))}Operator::I8x16ReplaceLane { lane } | Operator::I16x8ReplaceLane { lane } => {- let (vector, replacement) = stack.pop2();+ let (vector, replacement) = environ.stacks.pop2();let ty = type_of(op);let reduced = builder.ins().ireduce(ty.lane_type(), replacement);let vector = optionally_bitcast_vector(vector, ty, builder);- stack.push1(builder.ins().insertlane(vector, reduced, *lane))+ environ+ .stacks+ .push1(builder.ins().insertlane(vector, reduced, *lane))}Operator::I32x4ReplaceLane { lane }| Operator::I64x2ReplaceLane { lane }| Operator::F32x4ReplaceLane { lane }| Operator::F64x2ReplaceLane { lane } => {- let (vector, replacement) = stack.pop2();+ let (vector, replacement) = environ.stacks.pop2();let vector = optionally_bitcast_vector(vector, type_of(op), builder);- stack.push1(builder.ins().insertlane(vector, replacement, *lane))+ environ+ .stacks+ .push1(builder.ins().insertlane(vector, replacement, *lane))}Operator::I8x16Shuffle { lanes, .. } => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);- stack.push1(environ.i8x16_shuffle(builder, a, b, lanes));+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);+ let result = environ.i8x16_shuffle(builder, a, b, lanes);+ environ.stacks.push1(result);// At this point the original types of a and b are lost; users of this value (i.e. this// WASM-to-CLIF translator) may need to bitcast for type-correctness. This is due// to WASM using the less specific v128 type for certain operations and more specific// types (e.g. i8x16) for others.}Operator::I8x16Swizzle => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);- stack.push1(environ.swizzle(builder, a, b));+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);+ let result = environ.swizzle(builder, a, b);+ environ.stacks.push1(result);}Operator::I8x16Add | Operator::I16x8Add | Operator::I32x4Add | Operator::I64x2Add => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().iadd(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().iadd(a, b))}Operator::I8x16AddSatS | Operator::I16x8AddSatS => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().sadd_sat(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().sadd_sat(a, b))}Operator::I8x16AddSatU | Operator::I16x8AddSatU => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().uadd_sat(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().uadd_sat(a, b))}Operator::I8x16Sub | Operator::I16x8Sub | Operator::I32x4Sub | Operator::I64x2Sub => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().isub(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().isub(a, b))}Operator::I8x16SubSatS | Operator::I16x8SubSatS => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().ssub_sat(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().ssub_sat(a, b))}Operator::I8x16SubSatU | Operator::I16x8SubSatU => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().usub_sat(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().usub_sat(a, b))}Operator::I8x16MinS | Operator::I16x8MinS | Operator::I32x4MinS => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().smin(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().smin(a, b))}Operator::I8x16MinU | Operator::I16x8MinU | Operator::I32x4MinU => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().umin(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().umin(a, b))}Operator::I8x16MaxS | Operator::I16x8MaxS | Operator::I32x4MaxS => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().smax(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().smax(a, b))}Operator::I8x16MaxU | Operator::I16x8MaxU | Operator::I32x4MaxU => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().umax(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().umax(a, b))}Operator::I8x16AvgrU | Operator::I16x8AvgrU => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().avg_round(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().avg_round(a, b))}Operator::I8x16Neg | Operator::I16x8Neg | Operator::I32x4Neg | Operator::I64x2Neg => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().ineg(a))+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().ineg(a))}Operator::I8x16Abs | Operator::I16x8Abs | Operator::I32x4Abs | Operator::I64x2Abs => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().iabs(a))+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().iabs(a))}Operator::I16x8Mul | Operator::I32x4Mul | Operator::I64x2Mul => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().imul(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().imul(a, b))}Operator::V128Or => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().bor(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().bor(a, b))}Operator::V128Xor => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().bxor(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().bxor(a, b))}Operator::V128And => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().band(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().band(a, b))}Operator::V128AndNot => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().band_not(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().band_not(a, b))}Operator::V128Not => {- let a = stack.pop1();- stack.push1(builder.ins().bnot(a));+ let a = environ.stacks.pop1();+ environ.stacks.push1(builder.ins().bnot(a));}Operator::I8x16Shl | Operator::I16x8Shl | Operator::I32x4Shl | Operator::I64x2Shl => {- let (a, b) = stack.pop2();+ let (a, b) = environ.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, type_of(op), builder);// The spec expects to shift with `b mod lanewidth`; This is directly compatible// with cranelift's instruction.- stack.push1(builder.ins().ishl(bitcast_a, b))+ environ.stacks.push1(builder.ins().ishl(bitcast_a, b))}Operator::I8x16ShrU | Operator::I16x8ShrU | Operator::I32x4ShrU | Operator::I64x2ShrU => {- let (a, b) = stack.pop2();+ let (a, b) = environ.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, type_of(op), builder);// The spec expects to shift with `b mod lanewidth`; This is directly compatible// with cranelift's instruction.- stack.push1(builder.ins().ushr(bitcast_a, b))+ environ.stacks.push1(builder.ins().ushr(bitcast_a, b))}Operator::I8x16ShrS | Operator::I16x8ShrS | Operator::I32x4ShrS | Operator::I64x2ShrS => {- let (a, b) = stack.pop2();+ let (a, b) = environ.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, type_of(op), builder);// The spec expects to shift with `b mod lanewidth`; This is directly compatible// with cranelift's instruction.- stack.push1(builder.ins().sshr(bitcast_a, b))+ environ.stacks.push1(builder.ins().sshr(bitcast_a, b))}Operator::V128Bitselect => {- let (a, b, c) = pop3_with_bitcast(stack, I8X16, builder);+ let (a, b, c) = pop3_with_bitcast(environ, I8X16, builder);// The CLIF operand ordering is slightly different and the types of all three// operands must match (hence the bitcast).- stack.push1(builder.ins().bitselect(c, a, b))+ environ.stacks.push1(builder.ins().bitselect(c, a, b))}Operator::V128AnyTrue => {- let a = pop1_with_bitcast(stack, type_of(op), builder);+ let a = pop1_with_bitcast(environ, type_of(op), builder);let bool_result = builder.ins().vany_true(a);- stack.push1(builder.ins().uextend(I32, bool_result))+ environ+ .stacks+ .push1(builder.ins().uextend(I32, bool_result))}Operator::I8x16AllTrue| Operator::I16x8AllTrue| Operator::I32x4AllTrue| Operator::I64x2AllTrue => {- let a = pop1_with_bitcast(stack, type_of(op), builder);+ let a = pop1_with_bitcast(environ, type_of(op), builder);let bool_result = builder.ins().vall_true(a);- stack.push1(builder.ins().uextend(I32, bool_result))+ environ+ .stacks+ .push1(builder.ins().uextend(I32, bool_result))}Operator::I8x16Bitmask| Operator::I16x8Bitmask| Operator::I32x4Bitmask| Operator::I64x2Bitmask => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().vhigh_bits(I32, a));+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().vhigh_bits(I32, a));}Operator::I8x16Eq | Operator::I16x8Eq | Operator::I32x4Eq | Operator::I64x2Eq => {- translate_vector_icmp(IntCC::Equal, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::Equal, type_of(op), builder, environ)}Operator::I8x16Ne | Operator::I16x8Ne | Operator::I32x4Ne | Operator::I64x2Ne => {- translate_vector_icmp(IntCC::NotEqual, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::NotEqual, type_of(op), builder, environ)}Operator::I8x16GtS | Operator::I16x8GtS | Operator::I32x4GtS | Operator::I64x2GtS => {- translate_vector_icmp(IntCC::SignedGreaterThan, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::SignedGreaterThan, type_of(op), builder, environ)}Operator::I8x16LtS | Operator::I16x8LtS | Operator::I32x4LtS | Operator::I64x2LtS => {- translate_vector_icmp(IntCC::SignedLessThan, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::SignedLessThan, type_of(op), builder, environ)}Operator::I8x16GtU | Operator::I16x8GtU | Operator::I32x4GtU => {- translate_vector_icmp(IntCC::UnsignedGreaterThan, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::UnsignedGreaterThan, type_of(op), builder, environ)}Operator::I8x16LtU | Operator::I16x8LtU | Operator::I32x4LtU => {- translate_vector_icmp(IntCC::UnsignedLessThan, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::UnsignedLessThan, type_of(op), builder, environ)}Operator::I8x16GeS | Operator::I16x8GeS | Operator::I32x4GeS | Operator::I64x2GeS => {- translate_vector_icmp(IntCC::SignedGreaterThanOrEqual, type_of(op), builder, stack)+ translate_vector_icmp(+ IntCC::SignedGreaterThanOrEqual,+ type_of(op),+ builder,+ environ,+ )}Operator::I8x16LeS | Operator::I16x8LeS | Operator::I32x4LeS | Operator::I64x2LeS => {- translate_vector_icmp(IntCC::SignedLessThanOrEqual, type_of(op), builder, stack)+ translate_vector_icmp(IntCC::SignedLessThanOrEqual, type_of(op), builder, environ)}Operator::I8x16GeU | Operator::I16x8GeU | Operator::I32x4GeU => translate_vector_icmp(IntCC::UnsignedGreaterThanOrEqual,type_of(op),builder,- stack,+ environ,+ ),+ Operator::I8x16LeU | Operator::I16x8LeU | Operator::I32x4LeU => translate_vector_icmp(+ IntCC::UnsignedLessThanOrEqual,+ type_of(op),+ builder,+ environ,),- Operator::I8x16LeU | Operator::I16x8LeU | Operator::I32x4LeU => {- translate_vector_icmp(IntCC::UnsignedLessThanOrEqual, type_of(op), builder, stack)- }Operator::F32x4Eq | Operator::F64x2Eq => {- translate_vector_fcmp(FloatCC::Equal, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::Equal, type_of(op), builder, environ)}Operator::F32x4Ne | Operator::F64x2Ne => {- translate_vector_fcmp(FloatCC::NotEqual, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::NotEqual, type_of(op), builder, environ)}Operator::F32x4Lt | Operator::F64x2Lt => {- translate_vector_fcmp(FloatCC::LessThan, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::LessThan, type_of(op), builder, environ)}Operator::F32x4Gt | Operator::F64x2Gt => {- translate_vector_fcmp(FloatCC::GreaterThan, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::GreaterThan, type_of(op), builder, environ)}Operator::F32x4Le | Operator::F64x2Le => {- translate_vector_fcmp(FloatCC::LessThanOrEqual, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::LessThanOrEqual, type_of(op), builder, environ)}Operator::F32x4Ge | Operator::F64x2Ge => {- translate_vector_fcmp(FloatCC::GreaterThanOrEqual, type_of(op), builder, stack)+ translate_vector_fcmp(FloatCC::GreaterThanOrEqual, type_of(op), builder, environ)}Operator::F32x4Add | Operator::F64x2Add => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fadd(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fadd(a, b))}Operator::F32x4Sub | Operator::F64x2Sub => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fsub(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fsub(a, b))}Operator::F32x4Mul | Operator::F64x2Mul => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fmul(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fmul(a, b))}Operator::F32x4Div | Operator::F64x2Div => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fdiv(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fdiv(a, b))}Operator::F32x4Max | Operator::F64x2Max => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fmax(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fmax(a, b))}Operator::F32x4Min | Operator::F64x2Min => {- let (a, b) = pop2_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fmin(a, b))+ let (a, b) = pop2_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fmin(a, b))}Operator::F32x4PMax | Operator::F64x2PMax => {// Note the careful ordering here with respect to `fcmp` and@@ -1989,10 +2053,10 @@ pub fn translate_operator(// * If z1 is less than z2 then return z2.// * Else return z1.let ty = type_of(op);- let (a, b) = pop2_with_bitcast(stack, ty, builder);+ let (a, b) = pop2_with_bitcast(environ, ty, builder);let cmp = builder.ins().fcmp(FloatCC::LessThan, a, b);let cmp = optionally_bitcast_vector(cmp, ty, builder);- stack.push1(builder.ins().bitselect(cmp, b, a))+ environ.stacks.push1(builder.ins().bitselect(cmp, b, a))}Operator::F32x4PMin | Operator::F64x2PMin => {// Note the careful ordering here which is similar to `pmax` above:@@ -2001,60 +2065,68 @@ pub fn translate_operator(// * If z2 is less than z1 then return z2.// * Else return z1.let ty = type_of(op);- let (a, b) = pop2_with_bitcast(stack, ty, builder);+ let (a, b) = pop2_with_bitcast(environ, ty, builder);let cmp = builder.ins().fcmp(FloatCC::LessThan, b, a);let cmp = optionally_bitcast_vector(cmp, ty, builder);- stack.push1(builder.ins().bitselect(cmp, b, a))+ environ.stacks.push1(builder.ins().bitselect(cmp, b, a))}Operator::F32x4Sqrt | Operator::F64x2Sqrt => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().sqrt(a))+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().sqrt(a))}Operator::F32x4Neg | Operator::F64x2Neg => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fneg(a))+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fneg(a))}Operator::F32x4Abs | Operator::F64x2Abs => {- let a = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().fabs(a))+ let a = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().fabs(a))}Operator::F32x4ConvertI32x4S => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().fcvt_from_sint(F32X4, a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().fcvt_from_sint(F32X4, a))}Operator::F32x4ConvertI32x4U => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().fcvt_from_uint(F32X4, a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().fcvt_from_uint(F32X4, a))}Operator::F64x2ConvertLowI32x4S => {- let a = pop1_with_bitcast(stack, I32X4, builder);+ let a = pop1_with_bitcast(environ, I32X4, builder);let widened_a = builder.ins().swiden_low(a);- stack.push1(builder.ins().fcvt_from_sint(F64X2, widened_a));+ environ+ .stacks+ .push1(builder.ins().fcvt_from_sint(F64X2, widened_a));}Operator::F64x2ConvertLowI32x4U => {- let a = pop1_with_bitcast(stack, I32X4, builder);+ let a = pop1_with_bitcast(environ, I32X4, builder);let widened_a = builder.ins().uwiden_low(a);- stack.push1(builder.ins().fcvt_from_uint(F64X2, widened_a));+ environ+ .stacks+ .push1(builder.ins().fcvt_from_uint(F64X2, widened_a));}Operator::F64x2PromoteLowF32x4 => {- let a = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(builder.ins().fvpromote_low(a));+ let a = pop1_with_bitcast(environ, F32X4, builder);+ environ.stacks.push1(builder.ins().fvpromote_low(a));}Operator::F32x4DemoteF64x2Zero => {- let a = pop1_with_bitcast(stack, F64X2, builder);- stack.push1(builder.ins().fvdemote(a));+ let a = pop1_with_bitcast(environ, F64X2, builder);+ environ.stacks.push1(builder.ins().fvdemote(a));}Operator::I32x4TruncSatF32x4S => {- let a = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(builder.ins().fcvt_to_sint_sat(I32X4, a))+ let a = pop1_with_bitcast(environ, F32X4, builder);+ environ+ .stacks+ .push1(builder.ins().fcvt_to_sint_sat(I32X4, a))}Operator::I32x4TruncSatF64x2SZero => {- let a = pop1_with_bitcast(stack, F64X2, builder);+ let a = pop1_with_bitcast(environ, F64X2, builder);let converted_a = builder.ins().fcvt_to_sint_sat(I64X2, a);let handle = builder.func.dfg.constants.insert(vec![0u8; 16].into());let zero = builder.ins().vconst(I64X2, handle);- stack.push1(builder.ins().snarrow(converted_a, zero));+ environ+ .stacks+ .push1(builder.ins().snarrow(converted_a, zero));}// FIXME(#5913): the relaxed instructions here are translated the same@@ -2069,11 +2141,13 @@ pub fn translate_operator(// perhaps for other backends too) should be added and the codegen for// the relaxed instruction should conditionally be different.Operator::I32x4RelaxedTruncF32x4U | Operator::I32x4TruncSatF32x4U => {- let a = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(builder.ins().fcvt_to_uint_sat(I32X4, a))+ let a = pop1_with_bitcast(environ, F32X4, builder);+ environ+ .stacks+ .push1(builder.ins().fcvt_to_uint_sat(I32X4, a))}Operator::I32x4RelaxedTruncF64x2UZero | Operator::I32x4TruncSatF64x2UZero => {- let a = pop1_with_bitcast(stack, F64X2, builder);+ let a = pop1_with_bitcast(environ, F64X2, builder);let zero_constant = builder.func.dfg.constants.insert(vec![0u8; 16].into());let result = if environ.is_x86() && !environ.isa().has_round() {// On x86 the vector lowering for `fcvt_to_uint_sat` requires@@ -2093,218 +2167,234 @@ pub fn translate_operator(let zero = builder.ins().vconst(I64X2, zero_constant);builder.ins().uunarrow(converted_a, zero)};- stack.push1(result);+ environ.stacks.push1(result);}Operator::I8x16NarrowI16x8S => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().snarrow(a, b))+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().snarrow(a, b))}Operator::I16x8NarrowI32x4S => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().snarrow(a, b))+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().snarrow(a, b))}Operator::I8x16NarrowI16x8U => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().unarrow(a, b))+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().unarrow(a, b))}Operator::I16x8NarrowI32x4U => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().unarrow(a, b))+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().unarrow(a, b))}Operator::I16x8ExtendLowI8x16S => {- let a = pop1_with_bitcast(stack, I8X16, builder);- stack.push1(builder.ins().swiden_low(a))+ let a = pop1_with_bitcast(environ, I8X16, builder);+ environ.stacks.push1(builder.ins().swiden_low(a))}Operator::I16x8ExtendHighI8x16S => {- let a = pop1_with_bitcast(stack, I8X16, builder);- stack.push1(builder.ins().swiden_high(a))+ let a = pop1_with_bitcast(environ, I8X16, builder);+ environ.stacks.push1(builder.ins().swiden_high(a))}Operator::I16x8ExtendLowI8x16U => {- let a = pop1_with_bitcast(stack, I8X16, builder);- stack.push1(builder.ins().uwiden_low(a))+ let a = pop1_with_bitcast(environ, I8X16, builder);+ environ.stacks.push1(builder.ins().uwiden_low(a))}Operator::I16x8ExtendHighI8x16U => {- let a = pop1_with_bitcast(stack, I8X16, builder);- stack.push1(builder.ins().uwiden_high(a))+ let a = pop1_with_bitcast(environ, I8X16, builder);+ environ.stacks.push1(builder.ins().uwiden_high(a))}Operator::I32x4ExtendLowI16x8S => {- let a = pop1_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().swiden_low(a))+ let a = pop1_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().swiden_low(a))}Operator::I32x4ExtendHighI16x8S => {- let a = pop1_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().swiden_high(a))+ let a = pop1_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().swiden_high(a))}Operator::I32x4ExtendLowI16x8U => {- let a = pop1_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().uwiden_low(a))+ let a = pop1_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().uwiden_low(a))}Operator::I32x4ExtendHighI16x8U => {- let a = pop1_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().uwiden_high(a))+ let a = pop1_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().uwiden_high(a))}Operator::I64x2ExtendLowI32x4S => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().swiden_low(a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().swiden_low(a))}Operator::I64x2ExtendHighI32x4S => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().swiden_high(a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().swiden_high(a))}Operator::I64x2ExtendLowI32x4U => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().uwiden_low(a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().uwiden_low(a))}Operator::I64x2ExtendHighI32x4U => {- let a = pop1_with_bitcast(stack, I32X4, builder);- stack.push1(builder.ins().uwiden_high(a))+ let a = pop1_with_bitcast(environ, I32X4, builder);+ environ.stacks.push1(builder.ins().uwiden_high(a))}Operator::I16x8ExtAddPairwiseI8x16S => {- let a = pop1_with_bitcast(stack, I8X16, builder);+ let a = pop1_with_bitcast(environ, I8X16, builder);let widen_low = builder.ins().swiden_low(a);let widen_high = builder.ins().swiden_high(a);- stack.push1(builder.ins().iadd_pairwise(widen_low, widen_high));+ environ+ .stacks+ .push1(builder.ins().iadd_pairwise(widen_low, widen_high));}Operator::I32x4ExtAddPairwiseI16x8S => {- let a = pop1_with_bitcast(stack, I16X8, builder);+ let a = pop1_with_bitcast(environ, I16X8, builder);let widen_low = builder.ins().swiden_low(a);let widen_high = builder.ins().swiden_high(a);- stack.push1(builder.ins().iadd_pairwise(widen_low, widen_high));+ environ+ .stacks+ .push1(builder.ins().iadd_pairwise(widen_low, widen_high));}Operator::I16x8ExtAddPairwiseI8x16U => {- let a = pop1_with_bitcast(stack, I8X16, builder);+ let a = pop1_with_bitcast(environ, I8X16, builder);let widen_low = builder.ins().uwiden_low(a);let widen_high = builder.ins().uwiden_high(a);- stack.push1(builder.ins().iadd_pairwise(widen_low, widen_high));+ environ+ .stacks+ .push1(builder.ins().iadd_pairwise(widen_low, widen_high));}Operator::I32x4ExtAddPairwiseI16x8U => {- let a = pop1_with_bitcast(stack, I16X8, builder);+ let a = pop1_with_bitcast(environ, I16X8, builder);let widen_low = builder.ins().uwiden_low(a);let widen_high = builder.ins().uwiden_high(a);- stack.push1(builder.ins().iadd_pairwise(widen_low, widen_high));+ environ+ .stacks+ .push1(builder.ins().iadd_pairwise(widen_low, widen_high));}Operator::F32x4Ceil => {- let arg = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(environ.ceil_f32x4(builder, arg));+ let arg = pop1_with_bitcast(environ, F32X4, builder);+ let result = environ.ceil_f32x4(builder, arg);+ environ.stacks.push1(result);}Operator::F64x2Ceil => {- let arg = pop1_with_bitcast(stack, F64X2, builder);- stack.push1(environ.ceil_f64x2(builder, arg));+ let arg = pop1_with_bitcast(environ, F64X2, builder);+ let result = environ.ceil_f64x2(builder, arg);+ environ.stacks.push1(result);}Operator::F32x4Floor => {- let arg = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(environ.floor_f32x4(builder, arg));+ let arg = pop1_with_bitcast(environ, F32X4, builder);+ let result = environ.floor_f32x4(builder, arg);+ environ.stacks.push1(result);}Operator::F64x2Floor => {- let arg = pop1_with_bitcast(stack, F64X2, builder);- stack.push1(environ.floor_f64x2(builder, arg));+ let arg = pop1_with_bitcast(environ, F64X2, builder);+ let result = environ.floor_f64x2(builder, arg);+ environ.stacks.push1(result);}Operator::F32x4Trunc => {- let arg = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(environ.trunc_f32x4(builder, arg));+ let arg = pop1_with_bitcast(environ, F32X4, builder);+ let result = environ.trunc_f32x4(builder, arg);+ environ.stacks.push1(result);}Operator::F64x2Trunc => {- let arg = pop1_with_bitcast(stack, F64X2, builder);- stack.push1(environ.trunc_f64x2(builder, arg));+ let arg = pop1_with_bitcast(environ, F64X2, builder);+ let result = environ.trunc_f64x2(builder, arg);+ environ.stacks.push1(result);}Operator::F32x4Nearest => {- let arg = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(environ.nearest_f32x4(builder, arg));+ let arg = pop1_with_bitcast(environ, F32X4, builder);+ let result = environ.nearest_f32x4(builder, arg);+ environ.stacks.push1(result);}Operator::F64x2Nearest => {- let arg = pop1_with_bitcast(stack, F64X2, builder);- stack.push1(environ.nearest_f64x2(builder, arg));+ let arg = pop1_with_bitcast(environ, F64X2, builder);+ let result = environ.nearest_f64x2(builder, arg);+ environ.stacks.push1(result);}Operator::I32x4DotI16x8S => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);let alow = builder.ins().swiden_low(a);let blow = builder.ins().swiden_low(b);let low = builder.ins().imul(alow, blow);let ahigh = builder.ins().swiden_high(a);let bhigh = builder.ins().swiden_high(b);let high = builder.ins().imul(ahigh, bhigh);- stack.push1(builder.ins().iadd_pairwise(low, high));+ environ.stacks.push1(builder.ins().iadd_pairwise(low, high));}Operator::I8x16Popcnt => {- let arg = pop1_with_bitcast(stack, type_of(op), builder);- stack.push1(builder.ins().popcnt(arg));+ let arg = pop1_with_bitcast(environ, type_of(op), builder);+ environ.stacks.push1(builder.ins().popcnt(arg));}Operator::I16x8Q15MulrSatS => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);- stack.push1(builder.ins().sqmul_round_sat(a, b))+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(builder.ins().sqmul_round_sat(a, b))}Operator::I16x8ExtMulLowI8x16S => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);let a_low = builder.ins().swiden_low(a);let b_low = builder.ins().swiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I16x8ExtMulHighI8x16S => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);let a_high = builder.ins().swiden_high(a);let b_high = builder.ins().swiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::I16x8ExtMulLowI8x16U => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);let a_low = builder.ins().uwiden_low(a);let b_low = builder.ins().uwiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I16x8ExtMulHighI8x16U => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);let a_high = builder.ins().uwiden_high(a);let b_high = builder.ins().uwiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::I32x4ExtMulLowI16x8S => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);let a_low = builder.ins().swiden_low(a);let b_low = builder.ins().swiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I32x4ExtMulHighI16x8S => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);let a_high = builder.ins().swiden_high(a);let b_high = builder.ins().swiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::I32x4ExtMulLowI16x8U => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);let a_low = builder.ins().uwiden_low(a);let b_low = builder.ins().uwiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I32x4ExtMulHighI16x8U => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);let a_high = builder.ins().uwiden_high(a);let b_high = builder.ins().uwiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::I64x2ExtMulLowI32x4S => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);let a_low = builder.ins().swiden_low(a);let b_low = builder.ins().swiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I64x2ExtMulHighI32x4S => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);let a_high = builder.ins().swiden_high(a);let b_high = builder.ins().swiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::I64x2ExtMulLowI32x4U => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);let a_low = builder.ins().uwiden_low(a);let b_low = builder.ins().uwiden_low(b);- stack.push1(builder.ins().imul(a_low, b_low));+ environ.stacks.push1(builder.ins().imul(a_low, b_low));}Operator::I64x2ExtMulHighI32x4U => {- let (a, b) = pop2_with_bitcast(stack, I32X4, builder);+ let (a, b) = pop2_with_bitcast(environ, I32X4, builder);let a_high = builder.ins().uwiden_high(a);let b_high = builder.ins().uwiden_high(b);- stack.push1(builder.ins().imul(a_high, b_high));+ environ.stacks.push1(builder.ins().imul(a_high, b_high));}Operator::MemoryDiscard { .. } => {return Err(wasm_unsupported!(@@ -2315,8 +2405,8 @@ pub fn translate_operator(Operator::F32x4RelaxedMax | Operator::F64x2RelaxedMax => {let ty = type_of(op);- let (a, b) = pop2_with_bitcast(stack, ty, builder);- stack.push1(+ let (a, b) = pop2_with_bitcast(environ, ty, builder);+ environ.stacks.push1(if environ.relaxed_simd_deterministic() || !environ.is_x86() {// Deterministic semantics match the `fmax` instruction, or// the `fAAxBB.max` wasm instruction.@@ -2334,8 +2424,8 @@ pub fn translate_operator(Operator::F32x4RelaxedMin | Operator::F64x2RelaxedMin => {let ty = type_of(op);- let (a, b) = pop2_with_bitcast(stack, ty, builder);- stack.push1(+ let (a, b) = pop2_with_bitcast(environ, ty, builder);+ environ.stacks.push1(if environ.relaxed_simd_deterministic() || !environ.is_x86() {// Deterministic semantics match the `fmin` instruction, or// the `fAAxBB.min` wasm instruction.@@ -2352,27 +2442,32 @@ pub fn translate_operator(}Operator::I8x16RelaxedSwizzle => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);- stack.push1(environ.relaxed_swizzle(builder, a, b));+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);+ let result = environ.relaxed_swizzle(builder, a, b);+ environ.stacks.push1(result);}Operator::F32x4RelaxedMadd => {- let (a, b, c) = pop3_with_bitcast(stack, type_of(op), builder);- stack.push1(environ.fma_f32x4(builder, a, b, c));+ let (a, b, c) = pop3_with_bitcast(environ, type_of(op), builder);+ let result = environ.fma_f32x4(builder, a, b, c);+ environ.stacks.push1(result);}Operator::F64x2RelaxedMadd => {- let (a, b, c) = pop3_with_bitcast(stack, type_of(op), builder);- stack.push1(environ.fma_f64x2(builder, a, b, c));+ let (a, b, c) = pop3_with_bitcast(environ, type_of(op), builder);+ let result = environ.fma_f64x2(builder, a, b, c);+ environ.stacks.push1(result);}Operator::F32x4RelaxedNmadd => {- let (a, b, c) = pop3_with_bitcast(stack, type_of(op), builder);+ let (a, b, c) = pop3_with_bitcast(environ, type_of(op), builder);let a = builder.ins().fneg(a);- stack.push1(environ.fma_f32x4(builder, a, b, c));+ let result = environ.fma_f32x4(builder, a, b, c);+ environ.stacks.push1(result);}Operator::F64x2RelaxedNmadd => {- let (a, b, c) = pop3_with_bitcast(stack, type_of(op), builder);+ let (a, b, c) = pop3_with_bitcast(environ, type_of(op), builder);let a = builder.ins().fneg(a);- stack.push1(environ.fma_f64x2(builder, a, b, c));+ let result = environ.fma_f64x2(builder, a, b, c);+ environ.stacks.push1(result);}Operator::I8x16RelaxedLaneselect@@ -2380,11 +2475,11 @@ pub fn translate_operator(| Operator::I32x4RelaxedLaneselect| Operator::I64x2RelaxedLaneselect => {let ty = type_of(op);- let (a, b, c) = pop3_with_bitcast(stack, ty, builder);+ let (a, b, c) = pop3_with_bitcast(environ, ty, builder);// Note that the variable swaps here are intentional due to// the difference of the order of the wasm op and the clif// op.- stack.push1(+ environ.stacks.push1(if environ.relaxed_simd_deterministic()|| !environ.use_x86_blendv_for_relaxed_laneselect(ty){@@ -2398,8 +2493,8 @@ pub fn translate_operator(}Operator::I32x4RelaxedTruncF32x4S => {- let a = pop1_with_bitcast(stack, F32X4, builder);- stack.push1(+ let a = pop1_with_bitcast(environ, F32X4, builder);+ environ.stacks.push1(if environ.relaxed_simd_deterministic() || !environ.is_x86() {// Deterministic semantics are to match the// `i32x4.trunc_sat_f32x4_s` instruction.@@ -2410,7 +2505,7 @@ pub fn translate_operator()}Operator::I32x4RelaxedTruncF64x2SZero => {- let a = pop1_with_bitcast(stack, F64X2, builder);+ let a = pop1_with_bitcast(environ, F64X2, builder);let converted_a = if environ.relaxed_simd_deterministic() || !environ.is_x86() {// Deterministic semantics are to match the// `i32x4.trunc_sat_f64x2_s_zero` instruction.@@ -2421,11 +2516,13 @@ pub fn translate_operator(let handle = builder.func.dfg.constants.insert(vec![0u8; 16].into());let zero = builder.ins().vconst(I64X2, handle);- stack.push1(builder.ins().snarrow(converted_a, zero));+ environ+ .stacks+ .push1(builder.ins().snarrow(converted_a, zero));}Operator::I16x8RelaxedQ15mulrS => {- let (a, b) = pop2_with_bitcast(stack, I16X8, builder);- stack.push1(+ let (a, b) = pop2_with_bitcast(environ, I16X8, builder);+ environ.stacks.push1(if environ.relaxed_simd_deterministic()|| !environ.use_x86_pmulhrsw_for_relaxed_q15mul(){@@ -2438,8 +2535,8 @@ pub fn translate_operator();}Operator::I16x8RelaxedDotI8x16I7x16S => {- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);- stack.push1(+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);+ environ.stacks.push1(if environ.relaxed_simd_deterministic() || !environ.use_x86_pmaddubsw_for_dot() {// Deterministic semantics are to treat both operands as// signed integers and perform the dot product.@@ -2457,8 +2554,8 @@ pub fn translate_operator(}Operator::I32x4RelaxedDotI8x16I7x16AddS => {- let c = pop1_with_bitcast(stack, I32X4, builder);- let (a, b) = pop2_with_bitcast(stack, I8X16, builder);+ let c = pop1_with_bitcast(environ, I32X4, builder);+ let (a, b) = pop2_with_bitcast(environ, I8X16, builder);let dot =if environ.relaxed_simd_deterministic() || !environ.use_x86_pmaddubsw_for_dot() {// Deterministic semantics are to treat both operands as@@ -2476,22 +2573,22 @@ pub fn translate_operator(let dotlo = builder.ins().swiden_low(dot);let dothi = builder.ins().swiden_high(dot);let dot32 = builder.ins().iadd_pairwise(dotlo, dothi);- stack.push1(builder.ins().iadd(dot32, c));+ environ.stacks.push1(builder.ins().iadd(dot32, c));}Operator::BrOnNull { relative_depth } => {- let r = stack.pop1();- let [.., WasmValType::Ref(r_ty)] = operand_types else {+ let r = environ.stacks.pop1();+ let &[.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};- let (br_destination, inputs) = translate_br_if_args(*relative_depth, stack);- let is_null = environ.translate_ref_is_null(builder.cursor(), r, *r_ty)?;+ let is_null = environ.translate_ref_is_null(builder.cursor(), r, r_ty)?;+ let (br_destination, inputs) = translate_br_if_args(*relative_depth, environ);let else_block = builder.create_block();canonicalise_brif(builder, is_null, br_destination, inputs, else_block, &[]);builder.seal_block(else_block); // The only predecessor is the current block.builder.switch_to_block(else_block);- stack.push1(r);+ environ.stacks.push1(r);}Operator::BrOnNonNull { relative_depth } => {// We write this a bit differently from the spec to avoid an extra@@ -2500,17 +2597,19 @@ pub fn translate_operator(// Peek the value val from the stack.// If val is ref.null ht, then: pop the value val from the stack.// Else: Execute the instruction (br relative_depth).- let r = stack.peek1();+ let r = environ.stacks.peek1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};- let is_null = environ.translate_ref_is_null(builder.cursor(), r, *r_ty)?;- let (br_destination, inputs) = translate_br_if_args(*relative_depth, stack);+ let r_ty = *r_ty;+ let (br_destination, inputs) = translate_br_if_args(*relative_depth, environ);+ let inputs = inputs.to_vec();+ let is_null = environ.translate_ref_is_null(builder.cursor(), r, r_ty)?;let else_block = builder.create_block();- canonicalise_brif(builder, is_null, else_block, &[], br_destination, inputs);+ canonicalise_brif(builder, is_null, else_block, &[], br_destination, &inputs);// In the null case, pop the ref- stack.pop1();+ environ.stacks.pop1();builder.seal_block(else_block); // The only predecessor is the current block.@@ -2525,69 +2624,62 @@ pub fn translate_operator(let type_index = TypeIndex::from_u32(*type_index);let sigref = environ.get_or_create_sig_ref(builder.func, type_index);let num_args = environ.num_params_for_function_type(type_index);- let callee = stack.pop1();+ let callee = environ.stacks.pop1();// Bitcast any vector arguments to their default type, I8X16, before calling.- let args = stack.peekn_mut(num_args);- bitcast_wasm_params(environ, sigref, args, builder);+ let mut args = environ.stacks.peekn(num_args).to_vec();+ bitcast_wasm_params(environ, sigref, &mut args, builder);- let inst_results = environ.translate_call_ref(- builder,- stack,- srcloc,- sigref,- callee,- stack.peekn(num_args),- stack.handlers.handlers(),- )?;+ let inst_results =+ environ.translate_call_ref(builder, srcloc, sigref, callee, &args)?;debug_assert_eq!(inst_results.len(),builder.func.dfg.signatures[sigref].returns.len(),"translate_call_ref results should match the call signature");- stack.popn(num_args);- stack.pushn(&inst_results);+ environ.stacks.popn(num_args);+ environ.stacks.pushn(&inst_results);}Operator::RefAsNonNull => {- let r = stack.pop1();+ let r = environ.stacks.pop1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};let is_null = environ.translate_ref_is_null(builder.cursor(), r, *r_ty)?;environ.trapnz(builder, is_null, crate::TRAP_NULL_REFERENCE);- stack.push1(r);+ environ.stacks.push1(r);}Operator::RefI31 => {- let val = stack.pop1();+ let val = environ.stacks.pop1();let i31ref = environ.translate_ref_i31(builder.cursor(), val)?;- stack.push1(i31ref);+ environ.stacks.push1(i31ref);}Operator::I31GetS => {- let i31ref = stack.pop1();+ let i31ref = environ.stacks.pop1();let val = environ.translate_i31_get_s(builder, i31ref)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::I31GetU => {- let i31ref = stack.pop1();+ let i31ref = environ.stacks.pop1();let val = environ.translate_i31_get_u(builder, i31ref)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::StructNew { struct_type_index } => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);let arity = environ.struct_fields_len(struct_type_index)?;- let fields: StructFieldsVec = stack.peekn(arity).iter().copied().collect();- stack.popn(arity);+ let fields: StructFieldsVec = environ.stacks.peekn(arity).iter().copied().collect();+ environ.stacks.popn(arity);let struct_ref = environ.translate_struct_new(builder, struct_type_index, fields)?;- stack.push1(struct_ref);+ environ.stacks.push1(struct_ref);}Operator::StructNewDefault { struct_type_index } => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);let struct_ref = environ.translate_struct_new_default(builder, struct_type_index)?;- stack.push1(struct_ref);+ environ.stacks.push1(struct_ref);}Operator::StructSet {@@ -2595,8 +2687,8 @@ pub fn translate_operator(field_index,} => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);- let val = stack.pop1();- let struct_ref = stack.pop1();+ let val = environ.stacks.pop1();+ let struct_ref = environ.stacks.pop1();environ.translate_struct_set(builder,struct_type_index,@@ -2611,7 +2703,7 @@ pub fn translate_operator(field_index,} => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);- let struct_ref = stack.pop1();+ let struct_ref = environ.stacks.pop1();let val = environ.translate_struct_get(builder,struct_type_index,@@ -2619,7 +2711,7 @@ pub fn translate_operator(struct_ref,Some(Extension::Sign),)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::StructGetU {@@ -2627,7 +2719,7 @@ pub fn translate_operator(field_index,} => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);- let struct_ref = stack.pop1();+ let struct_ref = environ.stacks.pop1();let val = environ.translate_struct_get(builder,struct_type_index,@@ -2635,7 +2727,7 @@ pub fn translate_operator(struct_ref,Some(Extension::Zero),)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::StructGet {@@ -2643,7 +2735,7 @@ pub fn translate_operator(field_index,} => {let struct_type_index = TypeIndex::from_u32(*struct_type_index);- let struct_ref = stack.pop1();+ let struct_ref = environ.stacks.pop1();let val = environ.translate_struct_get(builder,struct_type_index,@@ -2651,20 +2743,20 @@ pub fn translate_operator(struct_ref,None,)?;- stack.push1(val);+ environ.stacks.push1(val);}Operator::ArrayNew { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (elem, len) = stack.pop2();+ let (elem, len) = environ.stacks.pop2();let array_ref = environ.translate_array_new(builder, array_type_index, elem, len)?;- stack.push1(array_ref);+ environ.stacks.push1(array_ref);}Operator::ArrayNewDefault { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let len = stack.pop1();+ let len = environ.stacks.pop1();let array_ref = environ.translate_array_new_default(builder, array_type_index, len)?;- stack.push1(array_ref);+ environ.stacks.push1(array_ref);}Operator::ArrayNewFixed {array_type_index,@@ -2672,10 +2764,10 @@ pub fn translate_operator(} => {let array_type_index = TypeIndex::from_u32(*array_type_index);let array_size = usize::try_from(*array_size).unwrap();- let elems = stack.peekn(array_size);- let array_ref = environ.translate_array_new_fixed(builder, array_type_index, elems)?;- stack.popn(array_size);- stack.push1(array_ref);+ let elems = environ.stacks.peekn(array_size).to_vec();+ let array_ref = environ.translate_array_new_fixed(builder, array_type_index, &elems)?;+ environ.stacks.popn(array_size);+ environ.stacks.push1(array_ref);}Operator::ArrayNewData {array_type_index,@@ -2683,7 +2775,7 @@ pub fn translate_operator(} => {let array_type_index = TypeIndex::from_u32(*array_type_index);let array_data_index = DataIndex::from_u32(*array_data_index);- let (data_offset, len) = stack.pop2();+ let (data_offset, len) = environ.stacks.pop2();let array_ref = environ.translate_array_new_data(builder,array_type_index,@@ -2691,7 +2783,7 @@ pub fn translate_operator(data_offset,len,)?;- stack.push1(array_ref);+ environ.stacks.push1(array_ref);}Operator::ArrayNewElem {array_type_index,@@ -2699,7 +2791,7 @@ pub fn translate_operator(} => {let array_type_index = TypeIndex::from_u32(*array_type_index);let array_elem_index = ElemIndex::from_u32(*array_elem_index);- let (elem_offset, len) = stack.pop2();+ let (elem_offset, len) = environ.stacks.pop2();let array_ref = environ.translate_array_new_elem(builder,array_type_index,@@ -2707,7 +2799,7 @@ pub fn translate_operator(elem_offset,len,)?;- stack.push1(array_ref);+ environ.stacks.push1(array_ref);}Operator::ArrayCopy {array_type_index_dst,@@ -2715,7 +2807,7 @@ pub fn translate_operator(} => {let array_type_index_dst = TypeIndex::from_u32(*array_type_index_dst);let array_type_index_src = TypeIndex::from_u32(*array_type_index_src);- let (dst_array, dst_index, src_array, src_index, len) = stack.pop5();+ let (dst_array, dst_index, src_array, src_index, len) = environ.stacks.pop5();environ.translate_array_copy(builder,array_type_index_dst,@@ -2729,7 +2821,7 @@ pub fn translate_operator(}Operator::ArrayFill { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (array, index, val, len) = stack.pop4();+ let (array, index, val, len) = environ.stacks.pop4();environ.translate_array_fill(builder, array_type_index, array, index, val, len)?;}Operator::ArrayInitData {@@ -2738,7 +2830,7 @@ pub fn translate_operator(} => {let array_type_index = TypeIndex::from_u32(*array_type_index);let array_data_index = DataIndex::from_u32(*array_data_index);- let (array, dst_index, src_index, len) = stack.pop4();+ let (array, dst_index, src_index, len) = environ.stacks.pop4();environ.translate_array_init_data(builder,array_type_index,@@ -2755,7 +2847,7 @@ pub fn translate_operator(} => {let array_type_index = TypeIndex::from_u32(*array_type_index);let array_elem_index = ElemIndex::from_u32(*array_elem_index);- let (array, dst_index, src_index, len) = stack.pop4();+ let (array, dst_index, src_index, len) = environ.stacks.pop4();environ.translate_array_init_elem(builder,array_type_index,@@ -2767,20 +2859,20 @@ pub fn translate_operator()?;}Operator::ArrayLen => {- let array = stack.pop1();+ let array = environ.stacks.pop1();let len = environ.translate_array_len(builder, array)?;- stack.push1(len);+ environ.stacks.push1(len);}Operator::ArrayGet { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (array, index) = stack.pop2();+ let (array, index) = environ.stacks.pop2();let elem =environ.translate_array_get(builder, array_type_index, array, index, None)?;- stack.push1(elem);+ environ.stacks.push1(elem);}Operator::ArrayGetS { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (array, index) = stack.pop2();+ let (array, index) = environ.stacks.pop2();let elem = environ.translate_array_get(builder,array_type_index,@@ -2788,11 +2880,11 @@ pub fn translate_operator(index,Some(Extension::Sign),)?;- stack.push1(elem);+ environ.stacks.push1(elem);}Operator::ArrayGetU { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (array, index) = stack.pop2();+ let (array, index) = environ.stacks.pop2();let elem = environ.translate_array_get(builder,array_type_index,@@ -2800,21 +2892,21 @@ pub fn translate_operator(index,Some(Extension::Zero),)?;- stack.push1(elem);+ environ.stacks.push1(elem);}Operator::ArraySet { array_type_index } => {let array_type_index = TypeIndex::from_u32(*array_type_index);- let (array, index, elem) = stack.pop3();+ let (array, index, elem) = environ.stacks.pop3();environ.translate_array_set(builder, array_type_index, array, index, elem)?;}Operator::RefEq => {- let (r1, r2) = stack.pop2();+ let (r1, r2) = environ.stacks.pop2();let eq = builder.ins().icmp(ir::condcodes::IntCC::Equal, r1, r2);let eq = builder.ins().uextend(ir::types::I32, eq);- stack.push1(eq);+ environ.stacks.push1(eq);}Operator::RefTestNonNull { hty } => {- let r = stack.pop1();+ let r = environ.stacks.pop1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2828,10 +2920,10 @@ pub fn translate_operator(r,*r_ty,)?;- stack.push1(result);+ environ.stacks.push1(result);}Operator::RefTestNullable { hty } => {- let r = stack.pop1();+ let r = environ.stacks.pop1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2845,10 +2937,10 @@ pub fn translate_operator(r,*r_ty,)?;- stack.push1(result);+ environ.stacks.push1(result);}Operator::RefCastNonNull { hty } => {- let r = stack.pop1();+ let r = environ.stacks.pop1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2863,10 +2955,10 @@ pub fn translate_operator(*r_ty,)?;environ.trapz(builder, cast_okay, crate::TRAP_CAST_FAILURE);- stack.push1(r);+ environ.stacks.push1(r);}Operator::RefCastNullable { hty } => {- let r = stack.pop1();+ let r = environ.stacks.pop1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2881,14 +2973,14 @@ pub fn translate_operator(*r_ty,)?;environ.trapz(builder, cast_okay, crate::TRAP_CAST_FAILURE);- stack.push1(r);+ environ.stacks.push1(r);}Operator::BrOnCast {relative_depth,to_ref_type,from_ref_type: _,} => {- let r = stack.peek1();+ let r = environ.stacks.peek1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2896,7 +2988,7 @@ pub fn translate_operator(let to_ref_type = environ.convert_ref_type(*to_ref_type)?;let cast_is_okay = environ.translate_ref_test(builder, to_ref_type, r, *r_ty)?;- let (cast_succeeds_block, inputs) = translate_br_if_args(*relative_depth, stack);+ let (cast_succeeds_block, inputs) = translate_br_if_args(*relative_depth, environ);let cast_fails_block = builder.create_block();canonicalise_brif(builder,@@ -2922,7 +3014,7 @@ pub fn translate_operator(to_ref_type,from_ref_type: _,} => {- let r = stack.peek1();+ let r = environ.stacks.peek1();let [.., WasmValType::Ref(r_ty)] = operand_types else {unreachable!("validation")};@@ -2930,7 +3022,7 @@ pub fn translate_operator(let to_ref_type = environ.convert_ref_type(*to_ref_type)?;let cast_is_okay = environ.translate_ref_test(builder, to_ref_type, r, *r_ty)?;- let (cast_fails_block, inputs) = translate_br_if_args(*relative_depth, stack);+ let (cast_fails_block, inputs) = translate_br_if_args(*relative_depth, environ);let cast_succeeds_block = builder.create_block();canonicalise_brif(builder,@@ -2968,9 +3060,9 @@ pub fn translate_operator(.to_smallvec();let result_types: SmallVec<[_; 8]> =environ.continuation_returns(cont_type_index).to_smallvec();- let r = stack.pop1();+ let r = environ.stacks.pop1();let contobj = environ.translate_cont_new(builder, r, &arg_types, &result_types)?;- stack.push1(contobj);+ environ.stacks.push1(contobj);}Operator::ContBind {argument_index,@@ -2996,12 +3088,15 @@ pub fn translate_operator(}}- let (original_contobj, args) = stack.peekn(arg_count + 1).split_last().unwrap();+ let (original_contobj, args) =+ environ.stacks.peekn(arg_count + 1).split_last().unwrap();+ let original_contobj = *original_contobj;+ let args = args.to_vec();- let new_contobj = environ.translate_cont_bind(builder, *original_contobj, args);+ let new_contobj = environ.translate_cont_bind(builder, original_contobj, &args);- stack.popn(arg_count + 1);- stack.push1(new_contobj);+ environ.stacks.popn(arg_count + 1);+ environ.stacks.push1(new_contobj);}Operator::Suspend { tag_index } => {let tag_index = TagIndex::from_u32(*tag_index);@@ -3012,14 +3107,14 @@ pub fn translate_operator(.map(|ty| crate::value_type(environ.isa(), *ty)).collect();- let params = stack.peekn(param_types.len());+ let params = environ.stacks.peekn(param_types.len()).to_vec();let param_count = params.len();let return_values =- environ.translate_suspend(builder, tag_index.as_u32(), params, &return_types);+ environ.translate_suspend(builder, tag_index.as_u32(), ¶ms, &return_types);- stack.popn(param_count);- stack.pushn(&return_values);+ environ.stacks.popn(param_count);+ environ.stacks.pushn(&return_values);}Operator::Resume {cont_type_index,@@ -3030,8 +3125,8 @@ pub fn translate_operator(for handle in &wasm_resume_table.handlers {match handle {wasmparser::Handle::OnLabel { tag, label } => {- let i = stack.control_stack.len() - 1 - (*label as usize);- let frame = &mut stack.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - (*label as usize);+ let frame = &mut environ.stacks.control_stack[i];// This is side-effecting!frame.set_branched_to_exit();clif_resume_table.push((*tag, Some(frame.br_destination())));@@ -3044,18 +3139,20 @@ pub fn translate_operator(let cont_type_index = TypeIndex::from_u32(*cont_type_index);let arity = environ.continuation_arguments(cont_type_index).len();- let (contobj, call_args) = stack.peekn(arity + 1).split_last().unwrap();+ let (contobj, call_args) = environ.stacks.peekn(arity + 1).split_last().unwrap();+ let contobj = *contobj;+ let call_args = call_args.to_vec();let cont_return_vals = environ.translate_resume(builder,cont_type_index.as_u32(),- *contobj,- call_args,+ contobj,+ &call_args,&clif_resume_table,)?;- stack.popn(arity + 1); // arguments + continuation- stack.pushn(&cont_return_vals);+ environ.stacks.popn(arity + 1); // arguments + continuation+ environ.stacks.pushn(&cont_return_vals);}Operator::ResumeThrow {cont_type_index: _,@@ -3077,7 +3174,9 @@ pub fn translate_operator(.to_smallvec();// Arity includes the continuation argumentlet arity = continuation_argument_types.len();- let (contobj, switch_args) = stack.peekn(arity).split_last().unwrap();+ let (contobj, switch_args) = environ.stacks.peekn(arity).split_last().unwrap();+ let contobj = *contobj;+ let switch_args = switch_args.to_vec();// Type of the continuation we are going to create by suspending the// currently running stack@@ -3106,13 +3205,13 @@ pub fn translate_operator(let switch_return_values = environ.translate_switch(builder,*tag_index,- *contobj,- switch_args,+ contobj,+ &switch_args,¤t_continuation_arg_types,)?;- stack.popn(arity);- stack.pushn(&switch_return_values)+ environ.stacks.popn(arity);+ environ.stacks.pushn(&switch_return_values)}Operator::GlobalAtomicGet { .. }@@ -3157,36 +3256,36 @@ pub fn translate_operator(}Operator::I64MulWideS => {- let (arg1, arg2) = stack.pop2();+ let (arg1, arg2) = environ.stacks.pop2();let arg1 = builder.ins().sextend(I128, arg1);let arg2 = builder.ins().sextend(I128, arg2);let result = builder.ins().imul(arg1, arg2);let (lo, hi) = builder.ins().isplit(result);- stack.push2(lo, hi);+ environ.stacks.push2(lo, hi);}Operator::I64MulWideU => {- let (arg1, arg2) = stack.pop2();+ let (arg1, arg2) = environ.stacks.pop2();let arg1 = builder.ins().uextend(I128, arg1);let arg2 = builder.ins().uextend(I128, arg2);let result = builder.ins().imul(arg1, arg2);let (lo, hi) = builder.ins().isplit(result);- stack.push2(lo, hi);+ environ.stacks.push2(lo, hi);}Operator::I64Add128 => {- let (arg1, arg2, arg3, arg4) = stack.pop4();+ let (arg1, arg2, arg3, arg4) = environ.stacks.pop4();let arg1 = builder.ins().iconcat(arg1, arg2);let arg2 = builder.ins().iconcat(arg3, arg4);let result = builder.ins().iadd(arg1, arg2);let (res1, res2) = builder.ins().isplit(result);- stack.push2(res1, res2);+ environ.stacks.push2(res1, res2);}Operator::I64Sub128 => {- let (arg1, arg2, arg3, arg4) = stack.pop4();+ let (arg1, arg2, arg3, arg4) = environ.stacks.pop4();let arg1 = builder.ins().iconcat(arg1, arg2);let arg2 = builder.ins().iconcat(arg3, arg4);let result = builder.ins().isub(arg1, arg2);let (res1, res2) = builder.ins().isplit(result);- stack.push2(res1, res2);+ environ.stacks.push2(res1, res2);}// catch-all as `Operator` is `#[non_exhaustive]`@@ -3202,15 +3301,14 @@ fn translate_unreachable_operator(validator: &FuncValidator<impl WasmModuleResources>,op: &Operator,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {- debug_assert!(!stack.reachable);+ debug_assert!(!environ.is_reachable());match *op {Operator::If { blockty } => {// Push a placeholder control stack entry. The if isn't reachable,// so we don't have any branches anywhere.- stack.push_if(+ environ.stacks.push_if(ir::Block::reserved_value(),ElseData::NoElse {branch_inst: ir::Inst::reserved_value(),@@ -3224,11 +3322,12 @@ fn translate_unreachable_operator(Operator::Loop { blockty: _ }| Operator::Block { blockty: _ }| Operator::TryTable { try_table: _ } => {- stack.push_block(ir::Block::reserved_value(), 0, 0);+ environ.stacks.push_block(ir::Block::reserved_value(), 0, 0);}Operator::Else => {- let i = stack.control_stack.len() - 1;- match stack.control_stack[i] {+ let i = environ.stacks.control_stack.len() - 1;+ let reachable = environ.is_reachable();+ match environ.stacks.control_stack[i] {ControlStackFrame::If {ref else_data,head_is_reachable,@@ -3237,11 +3336,11 @@ fn translate_unreachable_operator(..} => {debug_assert!(consequent_ends_reachable.is_none());- *consequent_ends_reachable = Some(stack.reachable);+ *consequent_ends_reachable = Some(reachable);if head_is_reachable {// We have a branch from the head of the `if` to the `else`.- stack.reachable = true;+ environ.stacks.reachable = true;let else_block = match *else_data {ElseData::NoElse {@@ -3251,10 +3350,10 @@ fn translate_unreachable_operator(let (params, _results) =blocktype_params_results(validator, blocktype)?;let else_block = block_with_params(builder, params, environ)?;- let frame = stack.control_stack.last().unwrap();+ let frame = environ.stacks.control_stack.last().unwrap();frame.truncate_value_stack_to_else_params(- &mut stack.stack,- &mut stack.stack_shape,+ &mut environ.stacks.stack,+ &mut environ.stacks.stack_shape,);// We change the target of the branch instruction.@@ -3267,10 +3366,10 @@ fn translate_unreachable_operator(else_block}ElseData::WithElse { else_block } => {- let frame = stack.control_stack.last().unwrap();+ let frame = environ.stacks.control_stack.last().unwrap();frame.truncate_value_stack_to_else_params(- &mut stack.stack,- &mut stack.stack_shape,+ &mut environ.stacks.stack,+ &mut environ.stacks.stack_shape,);else_block}@@ -3288,12 +3387,12 @@ fn translate_unreachable_operator(}}Operator::End => {- let value_stack = &mut stack.stack;- let stack_shape = &mut stack.stack_shape;- let control_stack = &mut stack.control_stack;+ let value_stack = &mut environ.stacks.stack;+ let stack_shape = &mut environ.stacks.stack_shape;+ let control_stack = &mut environ.stacks.control_stack;let frame = control_stack.pop().unwrap();- frame.restore_catch_handlers(&mut stack.handlers, builder);+ frame.restore_catch_handlers(&mut environ.stacks.handlers, builder);// Pop unused parameters from stack.frame.truncate_value_stack_to_original_size(value_stack, stack_shape);@@ -3334,7 +3433,7 @@ fn translate_unreachable_operator(// And add the return values of the block but only if the next block is reachable// (which corresponds to testing if the stack depth is 1)value_stack.extend_from_slice(builder.block_params(frame.following_code()));- stack.reachable = true;+ environ.stacks.reachable = true;}}_ => {@@ -3361,10 +3460,9 @@ fn prepare_addr(memarg: &MemArg,access_size: u8,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<Reachability<(MemFlags, Value, Value)>> {- let index = stack.pop1();+ let index = environ.stacks.pop1();let memory_index = MemoryIndex::from_u32(memarg.memory);let heap = environ.get_or_create_heap(builder.func, memory_index);@@ -3534,7 +3632,6 @@ fn align_atomic_addr(memarg: &MemArg,loaded_bytes: u8,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) {// Atomic addresses must all be aligned correctly, and for now we check@@ -3548,8 +3645,8 @@ fn align_atomic_addr(// alignment check itself. This can probably be optimized better and we// should do so in the future as well.if loaded_bytes > 1 {- let addr = stack.pop1(); // "peek" via pop then push- stack.push1(addr);+ let addr = environ.stacks.pop1(); // "peek" via pop then push+ environ.stacks.push1(addr);let effective_addr = if memarg.offset == 0 {addr} else {@@ -3571,11 +3668,10 @@ fn prepare_atomic_addr(memarg: &MemArg,loaded_bytes: u8,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<Reachability<(MemFlags, Value, Value)>> {- align_atomic_addr(memarg, loaded_bytes, builder, stack, environ);- prepare_addr(memarg, loaded_bytes, builder, stack, environ)+ align_atomic_addr(memarg, loaded_bytes, builder, environ);+ prepare_addr(memarg, loaded_bytes, builder, environ)}/// Translate a load instruction.@@ -3586,22 +3682,20 @@ fn translate_load(opcode: ir::Opcode,result_ty: Type,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<Reachability<()>> {let mem_op_size = mem_op_size(opcode, result_ty);- let (flags, wasm_index, base) =- match prepare_addr(memarg, mem_op_size, builder, stack, environ)? {- Reachability::Unreachable => return Ok(Reachability::Unreachable),- Reachability::Reachable((f, i, b)) => (f, i, b),- };+ let (flags, wasm_index, base) = match prepare_addr(memarg, mem_op_size, builder, environ)? {+ Reachability::Unreachable => return Ok(Reachability::Unreachable),+ Reachability::Reachable((f, i, b)) => (f, i, b),+ };environ.before_load(builder, mem_op_size, wasm_index, memarg.offset);let (load, dfg) = builder.ins().Load(opcode, result_ty, flags, Offset32::new(0), base);- stack.push1(dfg.first_result(load));+ environ.stacks.push1(dfg.first_result(load));Ok(Reachability::Reachable(()))}@@ -3610,16 +3704,15 @@ fn translate_store(memarg: &MemArg,opcode: ir::Opcode,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {- let val = stack.pop1();+ let val = environ.stacks.pop1();let val_ty = builder.func.dfg.value_type(val);let mem_op_size = mem_op_size(opcode, val_ty);let (flags, wasm_index, base) = unwrap_or_return_unreachable_state!(- stack,- prepare_addr(memarg, mem_op_size, builder, stack, environ)?+ environ,+ prepare_addr(memarg, mem_op_size, builder, environ)?);environ.before_store(builder, mem_op_size, wasm_index, memarg.offset);@@ -3640,10 +3733,10 @@ fn mem_op_size(opcode: ir::Opcode, ty: Type) -> u8 {}}-fn translate_icmp(cc: IntCC, builder: &mut FunctionBuilder, stack: &mut FuncTranslationStacks) {- let (arg0, arg1) = stack.pop2();+fn translate_icmp(cc: IntCC, builder: &mut FunctionBuilder, environ: &mut FuncEnvironment<'_>) {+ let (arg0, arg1) = environ.stacks.pop2();let val = builder.ins().icmp(cc, arg0, arg1);- stack.push1(builder.ins().uextend(I32, val));+ environ.stacks.push1(builder.ins().uextend(I32, val));}fn translate_atomic_rmw(@@ -3652,10 +3745,9 @@ fn translate_atomic_rmw(op: AtomicRmwOp,memarg: &MemArg,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {- let mut arg2 = stack.pop1();+ let mut arg2 = environ.stacks.pop1();let arg2_ty = builder.func.dfg.value_type(arg2);// The operation is performed at type `access_ty`, and the old value is zero-extended@@ -3681,12 +3773,11 @@ fn translate_atomic_rmw(}let (flags, _, addr) = unwrap_or_return_unreachable_state!(- stack,+ environ,prepare_atomic_addr(memarg,u8::try_from(access_ty.bytes()).unwrap(),builder,- stack,environ,)?);@@ -3695,7 +3786,7 @@ fn translate_atomic_rmw(if access_ty != widened_ty {res = builder.ins().uextend(widened_ty, res);}- stack.push1(res);+ environ.stacks.push1(res);Ok(())}@@ -3704,10 +3795,9 @@ fn translate_atomic_cas(access_ty: Type,memarg: &MemArg,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {- let (mut expected, mut replacement) = stack.pop2();+ let (mut expected, mut replacement) = environ.stacks.pop2();let expected_ty = builder.func.dfg.value_type(expected);let replacement_ty = builder.func.dfg.value_type(replacement);@@ -3738,12 +3828,11 @@ fn translate_atomic_cas(}let (flags, _, addr) = unwrap_or_return_unreachable_state!(- stack,+ environ,prepare_atomic_addr(memarg,u8::try_from(access_ty.bytes()).unwrap(),builder,- stack,environ,)?);@@ -3751,7 +3840,7 @@ fn translate_atomic_cas(if access_ty != widened_ty {res = builder.ins().uextend(widened_ty, res);}- stack.push1(res);+ environ.stacks.push1(res);Ok(())}@@ -3760,7 +3849,6 @@ fn translate_atomic_load(access_ty: Type,memarg: &MemArg,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {// The load is performed at type `access_ty`, and the loaded value is zero extended@@ -3781,12 +3869,11 @@ fn translate_atomic_load(assert!(w_ty_ok && widened_ty.bytes() >= access_ty.bytes());let (flags, _, addr) = unwrap_or_return_unreachable_state!(- stack,+ environ,prepare_atomic_addr(memarg,u8::try_from(access_ty.bytes()).unwrap(),builder,- stack,environ,)?);@@ -3794,7 +3881,7 @@ fn translate_atomic_load(if access_ty != widened_ty {res = builder.ins().uextend(widened_ty, res);}- stack.push1(res);+ environ.stacks.push1(res);Ok(())}@@ -3802,10 +3889,9 @@ fn translate_atomic_store(access_ty: Type,memarg: &MemArg,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {- let mut data = stack.pop1();+ let mut data = environ.stacks.pop1();let data_ty = builder.func.dfg.value_type(data);// The operation is performed at type `access_ty`, and the data to be stored may first@@ -3830,12 +3916,11 @@ fn translate_atomic_store(}let (flags, _, addr) = unwrap_or_return_unreachable_state!(- stack,+ environ,prepare_atomic_addr(memarg,u8::try_from(access_ty.bytes()).unwrap(),builder,- stack,environ,)?);@@ -3847,39 +3932,41 @@ fn translate_vector_icmp(cc: IntCC,needed_type: Type,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,) {- let (a, b) = stack.pop2();+ let (a, b) = env.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, needed_type, builder);let bitcast_b = optionally_bitcast_vector(b, needed_type, builder);- stack.push1(builder.ins().icmp(cc, bitcast_a, bitcast_b))+ env.stacks+ .push1(builder.ins().icmp(cc, bitcast_a, bitcast_b))}-fn translate_fcmp(cc: FloatCC, builder: &mut FunctionBuilder, stack: &mut FuncTranslationStacks) {- let (arg0, arg1) = stack.pop2();+fn translate_fcmp(cc: FloatCC, builder: &mut FunctionBuilder, env: &mut FuncEnvironment<'_>) {+ let (arg0, arg1) = env.stacks.pop2();let val = builder.ins().fcmp(cc, arg0, arg1);- stack.push1(builder.ins().uextend(I32, val));+ env.stacks.push1(builder.ins().uextend(I32, val));}fn translate_vector_fcmp(cc: FloatCC,needed_type: Type,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,) {- let (a, b) = stack.pop2();+ let (a, b) = env.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, needed_type, builder);let bitcast_b = optionally_bitcast_vector(b, needed_type, builder);- stack.push1(builder.ins().fcmp(cc, bitcast_a, bitcast_b))+ env.stacks+ .push1(builder.ins().fcmp(cc, bitcast_a, bitcast_b))}fn translate_br_if(relative_depth: u32,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,) {- let val = stack.pop1();- let (br_destination, inputs) = translate_br_if_args(relative_depth, stack);+ let val = env.stacks.pop1();+ let (br_destination, inputs) = translate_br_if_args(relative_depth, env);let next_block = builder.create_block();canonicalise_brif(builder, val, br_destination, inputs, next_block, &[]);@@ -3887,13 +3974,13 @@ fn translate_br_if(builder.switch_to_block(next_block);}-fn translate_br_if_args(+fn translate_br_if_args<'a>(relative_depth: u32,- stack: &mut FuncTranslationStacks,-) -> (ir::Block, &mut [ir::Value]) {- let i = stack.control_stack.len() - 1 - (relative_depth as usize);+ env: &'a mut FuncEnvironment<'_>,+) -> (ir::Block, &'a mut [ir::Value]) {+ let i = env.stacks.control_stack.len() - 1 - (relative_depth as usize);let (return_count, br_destination) = {- let frame = &mut stack.control_stack[i];+ let frame = &mut env.stacks.control_stack[i];// The values returned by the branch are still available for the reachable// code that comes after itframe.set_branched_to_exit();@@ -3904,7 +3991,7 @@ fn translate_br_if_args(};(return_count, frame.br_destination())};- let inputs = stack.peekn_mut(return_count);+ let inputs = env.stacks.peekn_mut(return_count);(br_destination, inputs)}@@ -4216,33 +4303,33 @@ fn canonicalise_brif(/// using v128 (i.e. CLIF's I8x16) we must re-type the values using a bitcast to avoid CLIF/// typing issues.fn pop1_with_bitcast(- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,needed_type: Type,builder: &mut FunctionBuilder,) -> Value {- optionally_bitcast_vector(stack.pop1(), needed_type, builder)+ optionally_bitcast_vector(env.stacks.pop1(), needed_type, builder)}/// A helper for popping and bitcasting two values; since SIMD values can lose their type by/// using v128 (i.e. CLIF's I8x16) we must re-type the values using a bitcast to avoid CLIF/// typing issues.fn pop2_with_bitcast(- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,needed_type: Type,builder: &mut FunctionBuilder,) -> (Value, Value) {- let (a, b) = stack.pop2();+ let (a, b) = env.stacks.pop2();let bitcast_a = optionally_bitcast_vector(a, needed_type, builder);let bitcast_b = optionally_bitcast_vector(b, needed_type, builder);(bitcast_a, bitcast_b)}fn pop3_with_bitcast(- stack: &mut FuncTranslationStacks,+ env: &mut FuncEnvironment<'_>,needed_type: Type,builder: &mut FunctionBuilder,) -> (Value, Value, Value) {- let (a, b, c) = stack.pop3();+ let (a, b, c) = env.stacks.pop3();let bitcast_a = optionally_bitcast_vector(a, needed_type, builder);let bitcast_b = optionally_bitcast_vector(b, needed_type, builder);let bitcast_c = optionally_bitcast_vector(c, needed_type, builder);@@ -4324,7 +4411,6 @@ fn bitcast_wasm_params(fn create_catch_block(builder: &mut FunctionBuilder,- stacks: &mut FuncTranslationStacks,catch: &wasmparser::Catch,environ: &mut FuncEnvironment<'_>,) -> WasmResult<ir::Block> {@@ -4373,7 +4459,7 @@ fn create_catch_block(// time.let clif_tag = tag.map(|t| ExceptionTag::from_u32(t));- stacks.handlers.add_handler(clif_tag, block);+ environ.stacks.handlers.add_handler(clif_tag, block);let mut params = vec![];@@ -4386,8 +4472,8 @@ fn create_catch_block(}// Generate the branch itself.- let i = stacks.control_stack.len() - 1 - (label as usize);- let frame = &mut stacks.control_stack[i];+ let i = environ.stacks.control_stack.len() - 1 - (label as usize);+ let frame = &mut environ.stacks.control_stack[i];frame.set_branched_to_exit();canonicalise_then_jump(builder, frame.br_destination(), ¶ms);diff --git a/crates/cranelift/src/translate/func_translator.rs b/crates/cranelift/src/translate/func_translator.rsindex e5be1537f4..bda7dd4deb 100644--- a/crates/cranelift/src/translate/func_translator.rs+++ b/crates/cranelift/src/translate/func_translator.rs@@ -7,7 +7,6 @@use crate::func_environ::FuncEnvironment;use crate::translate::TargetEnvironment;use crate::translate::code_translator::{bitcast_wasm_returns, translate_operator};-use crate::translate::stack::FuncTranslationStacks;use crate::translate::translation_utils::get_vmctx_value_label;use cranelift_codegen::entity::EntityRef;use cranelift_codegen::ir::{self, Block, InstBuilder, ValueLabel};@@ -23,7 +22,6 @@ use wasmtime_environ::{TypeConvert, WasmResult};/// functions which will reduce heap allocation traffic.pub struct FuncTranslator {func_ctx: FunctionBuilderContext,- state: FuncTranslationStacks,}impl FuncTranslator {@@ -31,7 +29,6 @@ impl FuncTranslator {pub fn new() -> Self {Self {func_ctx: FunctionBuilderContext::new(),- state: FuncTranslationStacks::new(),}}@@ -88,10 +85,12 @@ impl FuncTranslator {// function and its return values.let exit_block = builder.create_block();builder.append_block_params_for_function_returns(exit_block);- self.state.initialize(&builder.func.signature, exit_block);+ environ+ .stacks+ .initialize(&builder.func.signature, exit_block);parse_local_decls(&mut reader, &mut builder, num_params, environ, validator)?;- parse_function_body(validator, reader, &mut builder, &mut self.state, environ)?;+ parse_function_body(validator, reader, &mut builder, environ)?;builder.finalize();log::trace!("translated Wasm to CLIF:\n{}", func.display());@@ -239,13 +238,16 @@ fn parse_function_body(validator: &mut FuncValidator<impl WasmModuleResources>,reader: BinaryReader,builder: &mut FunctionBuilder,- stack: &mut FuncTranslationStacks,environ: &mut FuncEnvironment<'_>,) -> WasmResult<()> {// The control stack is initialized with a single block representing the whole function.- debug_assert_eq!(stack.control_stack.len(), 1, "State not initialized");+ debug_assert_eq!(+ environ.stacks.control_stack.len(),+ 1,+ "State not initialized"+ );- environ.before_translate_function(builder, stack)?;+ environ.before_translate_function(builder)?;let mut reader = OperatorsReader::new(reader);let mut operand_types = vec![];@@ -258,12 +260,12 @@ fn parse_function_body(let operand_types =validate_op_and_get_operand_types(validator, environ, &mut operand_types, &op, pos)?;- environ.before_translate_operator(&op, operand_types, builder, stack)?;- translate_operator(validator, &op, operand_types, builder, stack, environ)?;- environ.after_translate_operator(&op, validator, builder, stack)?;+ environ.before_translate_operator(&op, operand_types, builder)?;+ translate_operator(validator, &op, operand_types, builder, environ)?;+ environ.after_translate_operator(&op, validator, builder)?;}- environ.after_translate_function(builder, stack)?;+ environ.after_translate_function(builder)?;reader.finish()?;// The final `End` operator left us in the exit block where we need to manually add a return@@ -271,18 +273,19 @@ fn parse_function_body(//// If the exit block is unreachable, it may not have the correct arguments, so we would// generate a return instruction that doesn't match the signature.- if stack.reachable {+ if environ.is_reachable() {if !builder.is_unreachable() {- environ.handle_before_return(&stack.stack, builder);- bitcast_wasm_returns(&mut stack.stack, builder);- builder.ins().return_(&stack.stack);+ let mut returns = core::mem::take(&mut environ.stacks.stack);+ environ.handle_before_return(&returns, builder);+ bitcast_wasm_returns(&mut returns, builder);+ builder.ins().return_(&returns);}}// Discard any remaining values on the stack. Either we just returned them,// or the end of the function is unreachable.- stack.stack.clear();- stack.stack_shape.clear();+ environ.stacks.stack.clear();+ environ.stacks.stack_shape.clear();Ok(())}