diff --git a/cranelift/wasm/src/environ/dummy.rs b/cranelift/wasm/src/environ/dummy.rs index 4ebf0bdc29..6c94116e04 100644 --- a/cranelift/wasm/src/environ/dummy.rs +++ b/cranelift/wasm/src/environ/dummy.rs @@ -11,8 +11,8 @@ use crate::environ::{ use crate::func_translator::FuncTranslator; use crate::state::ModuleTranslationState; use crate::translation_utils::{ - DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, PassiveDataIndex, - PassiveElemIndex, SignatureIndex, Table, TableIndex, + DataIndex, DefinedFuncIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, + SignatureIndex, Table, TableIndex, }; use core::convert::TryFrom; use cranelift_codegen::cursor::FuncCursor; @@ -607,7 +607,7 @@ impl<'data> ModuleEnvironment<'data> for DummyEnvironment { fn declare_passive_element( &mut self, - _elem_index: PassiveElemIndex, + _elem_index: ElemIndex, _segments: Box<[FuncIndex]>, ) -> WasmResult<()> { Ok(()) @@ -615,7 +615,7 @@ impl<'data> ModuleEnvironment<'data> for DummyEnvironment { fn declare_passive_data( &mut self, - _elem_index: PassiveDataIndex, + _elem_index: DataIndex, _segments: &'data [u8], ) -> WasmResult<()> { Ok(()) diff --git a/cranelift/wasm/src/environ/spec.rs b/cranelift/wasm/src/environ/spec.rs index b0dd4d508d..ea590c5cf5 100644 --- a/cranelift/wasm/src/environ/spec.rs +++ b/cranelift/wasm/src/environ/spec.rs @@ -8,8 +8,8 @@ use crate::state::{FuncTranslationState, ModuleTranslationState}; use crate::translation_utils::{ - FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, PassiveDataIndex, PassiveElemIndex, - SignatureIndex, Table, TableIndex, + DataIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, + Table, TableIndex, }; use core::convert::From; use cranelift_codegen::cursor::FuncCursor; @@ -606,7 +606,7 @@ pub trait ModuleEnvironment<'data>: TargetEnvironment { /// Declare a passive element segment. fn declare_passive_element( &mut self, - index: PassiveElemIndex, + index: ElemIndex, elements: Box<[FuncIndex]>, ) -> WasmResult<()>; @@ -620,11 +620,7 @@ pub trait ModuleEnvironment<'data>: TargetEnvironment { } /// Declare a passive data segment. - fn declare_passive_data( - &mut self, - data_index: PassiveDataIndex, - data: &'data [u8], - ) -> WasmResult<()>; + fn declare_passive_data(&mut self, data_index: DataIndex, data: &'data [u8]) -> WasmResult<()>; /// Provides the contents of a function body. /// diff --git a/cranelift/wasm/src/lib.rs b/cranelift/wasm/src/lib.rs index b98c95b466..366dd7a0dc 100644 --- a/cranelift/wasm/src/lib.rs +++ b/cranelift/wasm/src/lib.rs @@ -66,9 +66,9 @@ pub use crate::module_translator::translate_module; pub use crate::state::func_state::FuncTranslationState; pub use crate::state::module_state::ModuleTranslationState; pub use crate::translation_utils::{ - get_vmctx_value_label, DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, - DefinedTableIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, - PassiveDataIndex, PassiveElemIndex, SignatureIndex, Table, TableElementType, TableIndex, + get_vmctx_value_label, DataIndex, DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, + DefinedTableIndex, ElemIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, + SignatureIndex, Table, TableElementType, TableIndex, }; /// Version number of this crate. diff --git a/cranelift/wasm/src/sections_translator.rs b/cranelift/wasm/src/sections_translator.rs index 6759a60c3f..847baf08cf 100644 --- a/cranelift/wasm/src/sections_translator.rs +++ b/cranelift/wasm/src/sections_translator.rs @@ -10,9 +10,8 @@ use crate::environ::{ModuleEnvironment, WasmError, WasmResult}; use crate::state::ModuleTranslationState; use crate::translation_utils::{ - tabletype_to_type, type_to_type, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, - MemoryIndex, PassiveDataIndex, PassiveElemIndex, SignatureIndex, Table, TableElementType, - TableIndex, + tabletype_to_type, type_to_type, DataIndex, ElemIndex, FuncIndex, Global, GlobalIndex, + GlobalInit, Memory, MemoryIndex, SignatureIndex, Table, TableElementType, TableIndex, }; use crate::{wasm_unsupported, HashMap}; use core::convert::TryFrom; @@ -345,7 +344,7 @@ pub fn parse_element_section<'data>( )? } ElementKind::Passive => { - let index = PassiveElemIndex::from_u32(index as u32); + let index = ElemIndex::from_u32(index as u32); environ.declare_passive_element(index, segments)?; } ElementKind::Declared => return Err(wasm_unsupported!("element kind declared")), @@ -404,7 +403,7 @@ pub fn parse_data_section<'data>( )?; } DataKind::Passive => { - let index = PassiveDataIndex::from_u32(index as u32); + let index = DataIndex::from_u32(index as u32); environ.declare_passive_data(index, data)?; } } diff --git a/cranelift/wasm/src/translation_utils.rs b/cranelift/wasm/src/translation_utils.rs index 8a19761a88..eb12db950f 100644 --- a/cranelift/wasm/src/translation_utils.rs +++ b/cranelift/wasm/src/translation_utils.rs @@ -59,13 +59,13 @@ entity_impl!(SignatureIndex); /// Index type of a passive data segment inside the WebAssembly module. #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)] -pub struct PassiveDataIndex(u32); -entity_impl!(PassiveDataIndex); +pub struct DataIndex(u32); +entity_impl!(DataIndex); /// Index type of a passive element segment inside the WebAssembly module. #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)] -pub struct PassiveElemIndex(u32); -entity_impl!(PassiveElemIndex); +pub struct ElemIndex(u32); +entity_impl!(ElemIndex); /// WebAssembly global. #[derive(Debug, Clone, Copy, Hash)] diff --git a/crates/environ/src/data_structures.rs b/crates/environ/src/data_structures.rs index e12dee3ca7..c2ecbdb084 100755 --- a/crates/environ/src/data_structures.rs +++ b/crates/environ/src/data_structures.rs @@ -23,7 +23,7 @@ pub mod entity { pub mod wasm { pub use cranelift_wasm::{ get_vmctx_value_label, DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, - DefinedTableIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex, - PassiveElemIndex, SignatureIndex, Table, TableElementType, TableIndex, + DefinedTableIndex, ElemIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, + MemoryIndex, SignatureIndex, Table, TableElementType, TableIndex, }; } diff --git a/crates/environ/src/module.rs b/crates/environ/src/module.rs index aacc6fe747..709829d044 100644 --- a/crates/environ/src/module.rs +++ b/crates/environ/src/module.rs @@ -5,8 +5,8 @@ use crate::WASM_MAX_PAGES; use cranelift_codegen::ir; use cranelift_entity::{EntityRef, PrimaryMap}; use cranelift_wasm::{ - DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, FuncIndex, Global, - GlobalIndex, Memory, MemoryIndex, PassiveElemIndex, SignatureIndex, Table, TableIndex, + DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, ElemIndex, + FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex, Table, TableIndex, }; use indexmap::IndexMap; use more_asserts::assert_ge; @@ -166,7 +166,7 @@ pub struct Module { pub table_elements: Vec, /// WebAssembly passive elements. - pub passive_elements: HashMap>, + pub passive_elements: HashMap>, /// WebAssembly table initializers. pub func_names: HashMap, @@ -239,7 +239,7 @@ impl Module { } /// Get the given passive element, if it exists. - pub fn get_passive_element(&self, index: PassiveElemIndex) -> Option<&[FuncIndex]> { + pub fn get_passive_element(&self, index: ElemIndex) -> Option<&[FuncIndex]> { self.passive_elements.get(&index).map(|es| &**es) } } diff --git a/crates/environ/src/module_environ.rs b/crates/environ/src/module_environ.rs index 7839bdd643..09ba9b7033 100644 --- a/crates/environ/src/module_environ.rs +++ b/crates/environ/src/module_environ.rs @@ -6,8 +6,8 @@ use cranelift_codegen::ir::{AbiParam, ArgumentPurpose}; use cranelift_codegen::isa::TargetFrontendConfig; use cranelift_entity::PrimaryMap; use cranelift_wasm::{ - self, translate_module, DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, - ModuleTranslationState, PassiveDataIndex, PassiveElemIndex, SignatureIndex, Table, TableIndex, + self, translate_module, DataIndex, DefinedFuncIndex, ElemIndex, FuncIndex, Global, GlobalIndex, + Memory, MemoryIndex, ModuleTranslationState, SignatureIndex, Table, TableIndex, TargetEnvironment, WasmError, WasmResult, }; use std::convert::TryFrom; @@ -336,7 +336,7 @@ impl<'data> cranelift_wasm::ModuleEnvironment<'data> for ModuleEnvironment<'data fn declare_passive_element( &mut self, - elem_index: PassiveElemIndex, + elem_index: ElemIndex, segments: Box<[FuncIndex]>, ) -> WasmResult<()> { let old = self @@ -397,7 +397,7 @@ impl<'data> cranelift_wasm::ModuleEnvironment<'data> for ModuleEnvironment<'data fn declare_passive_data( &mut self, - _data_index: PassiveDataIndex, + _data_index: DataIndex, _data: &'data [u8], ) -> WasmResult<()> { Err(WasmError::Unsupported( diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs index 94994929af..c2a3cd7143 100644 --- a/crates/runtime/src/instance.rs +++ b/crates/runtime/src/instance.rs @@ -29,8 +29,8 @@ use std::{mem, ptr, slice}; use thiserror::Error; use wasmtime_environ::entity::{packed_option::ReservedValue, BoxedSlice, EntityRef, PrimaryMap}; use wasmtime_environ::wasm::{ - DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, FuncIndex, - GlobalIndex, GlobalInit, MemoryIndex, PassiveElemIndex, SignatureIndex, TableIndex, + DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, ElemIndex, + FuncIndex, GlobalIndex, GlobalInit, MemoryIndex, SignatureIndex, TableIndex, }; use wasmtime_environ::{ir, DataInitializer, Module, TableElements, VMOffsets}; @@ -90,7 +90,7 @@ pub(crate) struct Instance { /// Passive elements in this instantiation. As `elem.drop`s happen, these /// entries get removed. A missing entry is considered equivalent to an /// empty slice. - passive_elements: RefCell>>, + passive_elements: RefCell>>, /// Pointers to functions in executable memory. finished_functions: BoxedSlice, @@ -587,7 +587,7 @@ impl Instance { pub(crate) fn table_init( &self, table_index: TableIndex, - elem_index: PassiveElemIndex, + elem_index: ElemIndex, dst: u32, src: u32, len: u32, @@ -621,7 +621,7 @@ impl Instance { } /// Drop an element. - pub(crate) fn elem_drop(&self, elem_index: PassiveElemIndex) { + pub(crate) fn elem_drop(&self, elem_index: ElemIndex) { // https://webassembly.github.io/reference-types/core/exec/instructions.html#exec-elem-drop let mut passive_elements = self.passive_elements.borrow_mut(); diff --git a/crates/runtime/src/libcalls.rs b/crates/runtime/src/libcalls.rs index 62840072e7..ee0970fb2d 100644 --- a/crates/runtime/src/libcalls.rs +++ b/crates/runtime/src/libcalls.rs @@ -36,7 +36,7 @@ use crate::table::Table; use crate::traphandlers::raise_lib_trap; use crate::vmcontext::VMContext; use wasmtime_environ::ir; -use wasmtime_environ::wasm::{DefinedMemoryIndex, MemoryIndex, PassiveElemIndex, TableIndex}; +use wasmtime_environ::wasm::{DefinedMemoryIndex, ElemIndex, MemoryIndex, TableIndex}; /// Implementation of f32.ceil pub extern "C" fn wasmtime_f32_ceil(x: f32) -> f32 { @@ -204,7 +204,7 @@ pub unsafe extern "C" fn wasmtime_table_init( let result = { let table_index = TableIndex::from_u32(table_index); let source_loc = ir::SourceLoc::new(source_loc); - let elem_index = PassiveElemIndex::from_u32(elem_index); + let elem_index = ElemIndex::from_u32(elem_index); let instance = (&mut *vmctx).instance(); instance.table_init(table_index, elem_index, dst, src, len, source_loc) }; @@ -215,7 +215,7 @@ pub unsafe extern "C" fn wasmtime_table_init( /// Implementation of `elem.drop`. pub unsafe extern "C" fn wasmtime_elem_drop(vmctx: *mut VMContext, elem_index: u32) { - let elem_index = PassiveElemIndex::from_u32(elem_index); + let elem_index = ElemIndex::from_u32(elem_index); let instance = (&mut *vmctx).instance(); instance.elem_drop(elem_index); }