T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wasm: Add support for nullref type

Browse Source 
Reference types now supports proper a nullref type. This commit changes
the Wasm translator to support this.
This commit is contained in:
Ryan Hunt
2020-01-06 15:36:46 -06:00
parent 32a95a89eb
commit 710182ad26
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cranelift/wasm/src/func_translator.rs
View File

@@ -196,6 +196,7 @@ fn declare_locals<FE: FuncEnvironment + ?Sized>(
let constant_handle = builder.func.dfg.constants.insert([0; 16].to_vec().into()); let constant_handle = builder.func.dfg.constants.insert([0; 16].to_vec().into());
builder.ins().vconst(ir::types::I8X16, constant_handle) builder.ins().vconst(ir::types::I8X16, constant_handle)
} }
NullRef => builder.ins().null(environ.reference_type()),
AnyRef => builder.ins().null(environ.reference_type()), AnyRef => builder.ins().null(environ.reference_type()),
AnyFunc => builder.ins().null(environ.reference_type()), AnyFunc => builder.ins().null(environ.reference_type()),
ty => return Err(wasm_unsupported!("unsupported local type {:?}", ty)), ty => return Err(wasm_unsupported!("unsupported local type {:?}", ty)),

7
cranelift/wasm/src/translation_utils.rs
View File

@@ -131,7 +131,9 @@ pub fn type_to_type<PE: TargetEnvironment + ?Sized>(
wasmparser::Type::F32 => Ok(ir::types::F32), wasmparser::Type::F32 => Ok(ir::types::F32),
wasmparser::Type::F64 => Ok(ir::types::F64), wasmparser::Type::F64 => Ok(ir::types::F64),
wasmparser::Type::V128 => Ok(ir::types::I8X16), wasmparser::Type::V128 => Ok(ir::types::I8X16),
wasmparser::Type::AnyRef | wasmparser::Type::AnyFunc => Ok(environ.reference_type()), wasmparser::Type::AnyRef | wasmparser::Type::AnyFunc | wasmparser::Type::NullRef => {
Ok(environ.reference_type())
}
ty => Err(wasm_unsupported!("type_to_type: wasm type {:?}", ty)), ty => Err(wasm_unsupported!("type_to_type: wasm type {:?}", ty)),
} }
} }
@@ -171,6 +173,7 @@ pub fn blocktype_params_results(
wasmparser::Type::V128 => (&[], &[wasmparser::Type::V128]), wasmparser::Type::V128 => (&[], &[wasmparser::Type::V128]),
wasmparser::Type::AnyRef => (&[], &[wasmparser::Type::AnyRef]), wasmparser::Type::AnyRef => (&[], &[wasmparser::Type::AnyRef]),
wasmparser::Type::AnyFunc => (&[], &[wasmparser::Type::AnyFunc]), wasmparser::Type::AnyFunc => (&[], &[wasmparser::Type::AnyFunc]),
wasmparser::Type::NullRef => (&[], &[wasmparser::Type::NullRef]),
wasmparser::Type::EmptyBlockType => (&[], &[]), wasmparser::Type::EmptyBlockType => (&[], &[]),
ty => return Err(wasm_unsupported!("blocktype_params_results: type {:?}", ty)), ty => return Err(wasm_unsupported!("blocktype_params_results: type {:?}", ty)),
}, },
@@ -203,7 +206,7 @@ pub fn ebb_with_params<PE: TargetEnvironment + ?Sized>(
wasmparser::Type::F64 => { wasmparser::Type::F64 => {
builder.append_ebb_param(ebb, ir::types::F64); builder.append_ebb_param(ebb, ir::types::F64);
} }
wasmparser::Type::AnyRef | wasmparser::Type::AnyFunc => { wasmparser::Type::AnyRef | wasmparser::Type::AnyFunc | wasmparser::Type::NullRef => {
builder.append_ebb_param(ebb, environ.reference_type()); builder.append_ebb_param(ebb, environ.reference_type());
} }
wasmparser::Type::V128 => { wasmparser::Type::V128 => {

11
cranelift/wasmtests/nullref.wat Normal file
View File

@@ -0,0 +1,11 @@
(module
(func (result nullref)
ref.null
)
(func (result nullref)
(block (result nullref)
ref.null
)
)
)