Merge branch 'master' into fix/emscripten-translate

This commit is contained in:
Lachlan Sneff 2019-02-02 15:29:59 -08:00 committed by GitHub
commit 312d70e345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -122,7 +122,7 @@ impl<'module, 'isa, 'data> ModuleEnvironment<'data> for ModuleEnv<'module, 'isa>
Initializer::Const(Value::F64(f64::from_bits(x))) Initializer::Const(Value::F64(f64::from_bits(x)))
} }
cranelift_wasm::GlobalInit::GetGlobal(global_index) => { cranelift_wasm::GlobalInit::GetGlobal(global_index) => {
assert!(!desc.mutable); // assert!(!desc.mutable);
let global_index: GlobalIndex = Converter(global_index).into(); let global_index: GlobalIndex = Converter(global_index).into();
let imported_global_index = global_index let imported_global_index = global_index
.local_or_import(self.module) .local_or_import(self.module)