rn module_ref()

crates/jit/src/instantiate.rs

@@ -254,7 +254,7 @@ impl CompiledModule {
  }
 
  /// Return a reference to a module.
- pub fn module_ref(&self) -> &Module {
+ pub fn module(&self) -> &Module {
  &self.module
  }
 

crates/runtime/src/debug_builtins.rs

@@ -16,7 +16,7 @@ pub unsafe extern "C" fn resolve_vmctx_memory_ptr(p: *const u32) -> *const u8 {
  );
  let handle = InstanceHandle::from_vmctx(VMCTX_AND_MEMORY.0);
  assert!(
- VMCTX_AND_MEMORY.1 < handle.module_ref().local.memory_plans.len(),
+ VMCTX_AND_MEMORY.1 < handle.module().local.memory_plans.len(),
  "memory index for debugger is out of bounds"
  );
  let index = MemoryIndex::new(VMCTX_AND_MEMORY.1);

crates/runtime/src/instance.rs

@@ -92,7 +92,7 @@ impl Instance {
  unsafe { *self.signature_ids_ptr().add(index) }
  }
 
- pub(crate) fn module_ref(&self) -> &Module {
+ pub(crate) fn module(&self) -> &Module {
  &self.module
  }
 
@@ -782,10 +782,8 @@ impl InstanceHandle {
  host_state: Box<dyn Any>,
  interrupts: Arc<VMInterrupts>,
  ) -> Result<Self, InstantiationError> {
- let module_ref = &*module;
- let tables = create_tables(module_ref);
- let memories =
- create_memories(module_ref, mem_creator.unwrap_or(&DefaultMemoryCreator {}))?;
+ let tables = create_tables(&module);
+ let memories = create_memories(&module, mem_creator.unwrap_or(&DefaultMemoryCreator {}))?;
 
  let vmctx_tables = tables
  .values()
@@ -799,11 +797,11 @@ impl InstanceHandle {
  .collect::<PrimaryMap<DefinedMemoryIndex, _>>()
  .into_boxed_slice();
 
- let vmctx_globals = create_globals(module_ref);
+ let vmctx_globals = create_globals(&module);
 
  let offsets = VMOffsets::new(mem::size_of::<*const u8>() as u8, &module.local);
 
- let passive_data = RefCell::new(module_ref.passive_data.clone());
+ let passive_data = RefCell::new(module.passive_data.clone());
 
  let handle = {
  let instance = Instance {
@@ -934,8 +932,8 @@ impl InstanceHandle {
  }
 
  /// Return a reference to a module.
- pub fn module_ref(&self) -> &Module {
- self.instance().module_ref()
+ pub fn module(&self) -> &Module {
+ self.instance().module()
  }
 
  /// Lookup an export with the given name.
@@ -1053,7 +1051,7 @@ impl InstanceHandle {
 
 fn check_table_init_bounds(instance: &Instance) -> Result<(), InstantiationError> {
  let module = Arc::clone(&instance.module);
- for init in &module.as_ref().table_elements {
+ for init in &module.table_elements {
  let start = get_table_init_start(init, instance);
  let table = instance.get_table(init.table_index);
 
@@ -1157,7 +1155,7 @@ fn get_table_init_start(init: &TableElements, instance: &Instance) -> usize {
 
 /// Initialize the table memory from the provided initializers.
 fn initialize_tables(instance: &Instance) -> Result<(), InstantiationError> {
- let module = instance.module.as_ref();
+ let module = &instance.module;
  for init in &module.table_elements {
  let start = get_table_init_start(init, instance);
  let table = instance.get_table(init.table_index);
@@ -1195,7 +1193,6 @@ fn initialize_passive_elements(instance: &Instance) {
  passive_elements.extend(
  instance
  .module
- .as_ref()
  .passive_elements
  .iter()
  .filter(|(_, segments)| !segments.is_empty())

crates/wasmtime/src/instance.rs

@@ -35,11 +35,11 @@ fn instantiate(
  }
  }
 
- if imports.len() != compiled_module.module_ref().imports.len() {
+ if imports.len() != compiled_module.module().imports.len() {
  bail!(
  "wrong number of imports provided, {} != {}",
  imports.len(),
- compiled_module.module_ref().imports.len()
+ compiled_module.module().imports.len()
  );
  }
 
@@ -79,7 +79,7 @@ fn instantiate(
  instance
  };
 
- let start_func = instance.handle.module_ref().start_func;
+ let start_func = instance.handle.module().start_func;
 
  // If a start function is present, invoke it. Make sure we use all the
  // trap-handling configuration in `store` as well.

crates/wasmtime/src/module.rs

@@ -417,7 +417,7 @@ impl Module {
  pub fn imports<'module>(
  &'module self,
  ) -> impl ExactSizeIterator<Item = ImportType<'module>> + 'module {
- let module = self.inner.compiled.module_ref();
+ let module = self.inner.compiled.module();
  module
  .imports
  .iter()
@@ -484,7 +484,7 @@ impl Module {
  pub fn exports<'module>(
  &'module self,
  ) -> impl ExactSizeIterator<Item = ExportType<'module>> + 'module {
- let module = self.inner.compiled.module_ref();
+ let module = self.inner.compiled.module();
  module.exports.iter().map(move |(name, entity_index)| {
  let r#type = EntityType::new(entity_index, module);
  ExportType::new(name, r#type)
@@ -535,7 +535,7 @@ impl Module {
  /// # }
  /// ```
  pub fn get_export<'module>(&'module self, name: &'module str) -> Option<ExternType> {
- let module = self.inner.compiled.module_ref();
+ let module = self.inner.compiled.module();
  let entity_index = module.exports.get(name)?;
  Some(EntityType::new(entity_index, module).extern_type())
  }