A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Fix alignment of VMFuncRefs in VMContext after an odd number of tags. (#14731)
Alex Crichton1fdc81b8b1b6
diff --git a/crates/environ/src/vmctxtypes.rs b/crates/environ/src/vmctxtypes.rsindex 36fac62515..f3116e8eed 100644--- a/crates/environ/src/vmctxtypes.rs+++ b/crates/environ/src/vmctxtypes.rs@@ -229,6 +229,8 @@ macro_rules! for_each_vmctx_type {tags[num_defined_tags; DefinedTagIndex]: VMTagDefinition}+ align { ptr }+array {#[aggregate]func_refs[num_escaped_funcs; FuncRefIndex]: VMFuncRefdiff --git a/crates/environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rsindex 9ab53ba1a0..dd8c6e9837 100644--- a/crates/environ/src/vmoffsets.rs+++ b/crates/environ/src/vmoffsets.rs@@ -905,7 +905,7 @@ pub const VM_ARRAY_CALL_HOST_FUNC_MAGIC: u32 = u32::from_le_bytes(*b"ACHF");#[cfg(test)]mod tests {- use crate::vmoffsets::align;+ use crate::vmoffsets::{VMOffsets, VMOffsetsFields, align};#[test]fn alignment() {@@ -917,6 +917,34 @@ mod tests {assert!(is_aligned(align(33, 16)));assert!(is_aligned(align(31, 16)));}++ #[test]+ fn pointer_fields_aligned_after_tags() {+ for ptr in [4u8, 8] {+ for num_defined_tags in 0..4 {+ let offsets = VMOffsets::from(VMOffsetsFields {+ ptr,+ num_imported_functions: 0,+ num_imported_tables: 0,+ num_imported_memories: 0,+ num_imported_globals: 0,+ num_imported_tags: 0,+ num_defined_tables: 0,+ num_defined_memories: 0,+ num_owned_memories: 0,+ num_defined_globals: 0,+ num_defined_tags,+ num_escaped_funcs: 1,+ num_runtime_data: 1,+ has_startup_func: true,+ });+ let ptr = u32::from(ptr);+ assert_eq!(offsets.func_refs % ptr, 0);+ assert_eq!(offsets.startup_func_ref % ptr, 0);+ assert_eq!(offsets.runtime_data_bases % ptr, 0);+ }+ }+ }}/// The bit pattern of `VMLazyThread::forced()`.