fix: borrow export name from bytecode instead of allocating it

Signed-off-by: Florian Hartung <florian.hartung@dlr.de>

Author: florianhartung

src/core/reader/types/export.rs

@@ -1,6 +1,3 @@
-use alloc::borrow::ToOwned;
-use alloc::string::String;
-
 use crate::core::indices::{FuncIdx, GlobalIdx, MemIdx, TableIdx};
 use crate::core::reader::types::import::ImportDesc;
 use crate::core::reader::WasmReader;
@@ -9,14 +6,14 @@ use crate::{ValidationError, ValidationInfo};
 use super::ExternType;
 
 #[derive(Debug, Clone)]
-pub struct Export {
-    pub name: String,
+pub struct Export<'wasm> {
+    pub name: &'wasm str,
     pub desc: ExportDesc,
 }
 
-impl Export {
-    pub fn read(wasm: &mut WasmReader) -> Result<Self, ValidationError> {
-        let name = wasm.read_name()?.to_owned();
+impl<'wasm> Export<'wasm> {
+    pub fn read(wasm: &mut WasmReader<'wasm>) -> Result<Self, ValidationError> {
+        let name = wasm.read_name()?;
         let desc = ExportDesc::read(wasm)?;
         Ok(Export { name, desc })
     }

src/execution/store/mod.rs

@@ -9,7 +9,7 @@ use crate::core::indices::TypeIdx;
 use crate::core::reader::span::Span;
 use crate::core::reader::types::data::{DataModeActive, DataSegment};
 use crate::core::reader::types::element::{ActiveElem, ElemItems, ElemMode, ElemType};
-use crate::core::reader::types::export::{Export, ExportDesc};
+use crate::core::reader::types::export::ExportDesc;
 use crate::core::reader::types::global::{Global, GlobalType};
 use crate::core::reader::types::{
     ExternType, FuncType, ImportSubTypeRelation, MemType, ResultType, TableType,
@@ -22,6 +22,7 @@ use crate::resumable::{
     Dormitory, FreshResumableRef, InvokedResumableRef, Resumable, ResumableRef, RunState,
 };
 use crate::{RefType, RuntimeError, ValidationInfo};
+use alloc::borrow::ToOwned;
 use alloc::collections::btree_map::BTreeMap;
 use alloc::string::String;
 use alloc::sync::Arc;
@@ -287,19 +288,17 @@ impl<'b, T: Config> Store<'b, T> {
         let export_insts: BTreeMap<String, ExternVal> = module
             .exports
             .iter()
-            .map(|Export { name, desc }| {
+            .map(|export| {
                 let module_inst = self.modules.get(module_addr);
-                let value = match desc {
-                    ExportDesc::Func(func_idx) => {
-                        ExternVal::Func(module_inst.func_addrs[*func_idx])
-                    }
-                    ExportDesc::Table(table_idx) => ExternVal::Table(table_addrs_mod[*table_idx]),
-                    ExportDesc::Mem(mem_idx) => ExternVal::Mem(mem_addrs_mod[*mem_idx]),
+                let value = match export.desc {
+                    ExportDesc::Func(func_idx) => ExternVal::Func(module_inst.func_addrs[func_idx]),
+                    ExportDesc::Table(table_idx) => ExternVal::Table(table_addrs_mod[table_idx]),
+                    ExportDesc::Mem(mem_idx) => ExternVal::Mem(mem_addrs_mod[mem_idx]),
                     ExportDesc::Global(global_idx) => {
-                        ExternVal::Global(module_inst.global_addrs[*global_idx])
+                        ExternVal::Global(module_inst.global_addrs[global_idx])
                     }
                 };
-                (String::from(name), value)
+                (export.name.to_owned(), value)
             })
             .collect();
 

src/validation/mod.rs

@@ -44,7 +44,7 @@ pub struct ValidationInfo<'bytecode> {
     pub(crate) tables: Vec<TableType>,
     pub(crate) memories: Vec<MemType>,
     pub(crate) globals: Vec<Global>,
-    pub(crate) exports: Vec<Export>,
+    pub(crate) exports: Vec<Export<'bytecode>>,
     /// Each block contains the validated code section and the stp corresponding to
     /// the beginning of that code section
     pub(crate) func_blocks_stps: Vec<(Span, usize)>,
@@ -61,10 +61,10 @@ fn validate_exports(validation_info: &ValidationInfo) -> Result<(), ValidationEr
     let mut found_export_names: btree_set::BTreeSet<&str> = btree_set::BTreeSet::new();
     use crate::core::reader::types::export::ExportDesc::*;
     for export in &validation_info.exports {
-        if found_export_names.contains(export.name.as_str()) {
+        if found_export_names.contains(export.name) {
             return Err(ValidationError::DuplicateExportName);
         }
-        found_export_names.insert(export.name.as_str());
+        found_export_names.insert(export.name);
         match export.desc {
             Func(func_idx) => {
                 if validation_info.functions.len()