mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-09 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use byte slice for constructing JS modules

Browse Source 
Re-implement the change from IntoBytes to plain &[u8].

This was probably messed up during a rebase.
This commit is contained in:
Christoph Herzog
2022-12-16 00:14:35 +01:00
parent 283e53f5b9
commit af313838b1
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/api/src/js/module.rs
View File

@@ -134,9 +134,8 @@ impl Module {
/// # }
/// ```
#[allow(unreachable_code)]
pub fn new(_store: &impl AsStoreRef, bytes: impl IntoBytes) -> Result<Self, CompileError> {
#[allow(unused_mut)]
let mut bytes = bytes.into_bytes();
pub fn new(_store: &impl AsStoreRef, bytes: impl AsRef<[u8]>) -> Result<Self, CompileError> {
let bytes = bytes.as_ref();
#[cfg(feature = "wat")]
if bytes.starts_with(b"\0asm") == false {
let parsed_bytes = wat::parse_bytes(bytes.as_ref()).map_err(|e| {
@@ -145,7 +144,7 @@ impl Module {
e
)))
})?;
bytes = Bytes::from(parsed_bytes.to_vec());
return Self::from_binary(_store, parsed_bytes.as_ref());
}
Self::from_binary(_store, bytes)
}
@@ -163,12 +162,7 @@ impl Module {
/// Opposed to [`Module::new`], this function is not compatible with
/// the WebAssembly text format (if the "wat" feature is enabled for
/// this crate).
pub fn from_binary(
_store: &impl AsStoreRef,
binary: impl IntoBytes,
) -> Result<Self, CompileError> {
let binary = binary.into_bytes();
//
pub fn from_binary(_store: &impl AsStoreRef, binary: &[u8]) -> Result<Self, CompileError> {
// Self::validate(store, binary)?;
unsafe { Self::from_binary_unchecked(_store, binary) }
}
@@ -181,17 +175,16 @@ impl Module {
/// We maintain the `unsafe` to preserve the same API as Wasmer
pub unsafe fn from_binary_unchecked(
store: &impl AsStoreRef,
binary: impl IntoBytes,
binary: &[u8],
) -> Result<Self, CompileError> {
let binary = binary.into_bytes();
let js_bytes = Uint8Array::view(&binary[..]);
let js_bytes = Uint8Array::view(binary);
let module = WebAssembly::Module::new(&js_bytes.into()).unwrap();
Self::from_js_module(
store,
module,
#[cfg(feature = "js-serializable-module")]
Bytes::from(binary),
binary,
)
}