Allow mutable exported global (wasmi-labs#228)

* Allow mutable exported global. * Update test for mutable global which is now legal.
patractlabs · Jan 22, 2020 · e8d5fb6 · e8d5fb6
1 parent d35bb3c
commit e8d5fb6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/tests/spec/testsuite b/tests/spec/testsuite
diff --git a/validation/src/lib.rs b/validation/src/lib.rs
@@ -262,7 +262,7 @@ pub fn validate_module<V: Validator>(module: &Module) -> Result<V::Output, Error
                     context.require_function(function_index)?;
                 }
                 Internal::Global(global_index) => {
-                    context.require_global(global_index, Some(false))?;
+                    context.require_global(global_index, None)?;
                 }
                 Internal::Memory(memory_index) => {
                     context.require_memory(memory_index)?;
@@ -281,14 +281,7 @@ pub fn validate_module<V: Validator>(module: &Module) -> Result<V::Output, Error
                 External::Function(function_type_index) => {
                     context.require_function_type(function_type_index)?;
                 }
-                External::Global(ref global_type) => {
-                    if global_type.is_mutable() {
-                        return Err(Error(format!(
-                            "trying to import mutable global {}",
-                            import.field()
-                        )));
-                    }
-                }
+                External::Global(_) => {}
                 External::Memory(ref memory_type) => {
                     validate_memory_type(memory_type)?;
                 }

diff --git a/validation/src/tests.rs b/validation/src/tests.rs
@@ -239,15 +239,15 @@ fn globals() {
         .build();
     assert!(validate_module(&m).is_ok());
 
-    // import mutable global is invalid.
+    // import mutable global is legal.
     let m = module()
         .with_import(ImportEntry::new(
             "env".into(),
             "ext_global".into(),
             External::Global(GlobalType::new(ValueType::I32, true)),
         ))
         .build();
-    assert!(validate_module(&m).is_err());
+    assert!(validate_module(&m).is_ok());
 }
 
 #[test]
+557 −71		address.wast
+836 −3		align.wast
+19 −2		binary.wast
+801 −20		block.wast
+222 −0		br_if.wast
+1 −1		br_table.wast
+1 −1		float_exprs.wast
+8 −0		float_literals.wast
+1 −1		float_misc.wast
+3 −19		globals.wast
+293 −0		if.wast
+33 −0		linking.wast
+122 −0		loop.wast
+0 −93		memory.wast
+97 −0		memory_grow.wast
+10 −0		names.wast
+134 −2		nop.wast
+18 −0		return.wast
+64 −0		unwind.wast