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

Handle uninitialized values of type b1 and vector.

Browse Source
This commit is contained in:
Dan Gohman
2017-10-23 14:57:20 -07:00
parent bdf726d101
commit fdf2486c0a
1 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/frontend/src/ssa.rs
View File

@@ -488,19 +488,26 @@ where
if !func.layout.is_ebb_inserted(dest_ebb) {
func.layout.append_ebb(dest_ebb)
};
let ty = func.dfg.value_type(temp_arg_val);
let mut cur = FuncCursor::new(func).at_first_insertion_point(dest_ebb);
let val = if ty.is_int() {
self.side_effects.instructions_added_to_ebbs.push(dest_ebb);
fn emit_zero(ty: Type, mut cur: FuncCursor) -> Value {
if ty.is_int() {
cur.ins().iconst(ty, 0)
} else if ty.is_bool() {
cur.ins().bconst(ty, false)
} else if ty == F32 {
cur.ins().f32const(Ieee32::with_bits(0))
} else if ty == F64 {
cur.ins().f64const(Ieee64::with_bits(0))
} else if ty.is_vector() {
emit_zero(ty.lane_type(), cur)
} else {
panic!("value used but never declared and initialization not supported")
};
self.side_effects.instructions_added_to_ebbs.push(dest_ebb);
val
panic!("use of undefined value unsupported for type {}", ty)
}
}
emit_zero(
func.dfg.value_type(temp_arg_val),
FuncCursor::new(func).at_first_insertion_point(dest_ebb),
)
}
ZeroOneOrMore::One(pred_val) => {
// Here all the predecessors use a single value to represent our variable
@@ -1063,6 +1070,27 @@ mod tests {
assert_eq!(func.dfg.ebb_params(ebb1)[0], x2);
}
#[test]
fn undef() {
// Use vars of varous types which have not been defined.
let mut func = Function::new();
let mut ssa: SSABuilder<Variable> = SSABuilder::new();
let ebb0 = func.dfg.make_ebb();
let block = ssa.declare_ebb_header_block(ebb0);
ssa.seal_ebb_header_block(ebb0, &mut func);
let i32_var = Variable(0);
let f32_var = Variable(1);
let f64_var = Variable(2);
let b1_var = Variable(3);
let f32x4_var = Variable(4);
ssa.use_var(&mut func, i32_var, I32, block);
ssa.use_var(&mut func, f32_var, F32, block);
ssa.use_var(&mut func, f64_var, F64, block);
ssa.use_var(&mut func, b1_var, B1, block);
ssa.use_var(&mut func, f32x4_var, F32X4, block);
assert_eq!(func.dfg.num_ebb_params(ebb0), 0);
}
#[test]
fn undef_in_entry() {
// Use a var which has not been defined. The search should hit the