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

Fixed bug in verifier (#109)

Browse Source 
* Fixed bug in verifier
Does not check variable def for unreachable codex

* Check reachability first + file test
This commit is contained in:
Denis Merigoux
2017-07-05 08:44:51 -07:00
committed by Jakob Stoklund Olesen
parent 8c60555409
commit f867ddbf0c
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
filetests/verifier/unreachable_code.cton Normal file
View File

@@ -0,0 +1,23 @@
test verifier
function %test() -> i32 { ; Ok
ebb0:
v0 = iconst.i32 0
v1 = iconst.i32 0
jump ebb2
ebb2:
jump ebb4
ebb4:
jump ebb2
ebb3(v2: i32):
v4 = iadd.i32 v1, v2
jump ebb9(v4)
ebb9(v7: i32):
v9 = iadd.i32 v2, v7
return v9
}

6
lib/cretonne/src/verifier/mod.rs
View File

@@ -363,7 +363,8 @@ impl<'a> Verifier<'a> {
def_inst); def_inst);
} }
// Defining instruction dominates the instruction that uses the value. // Defining instruction dominates the instruction that uses the value.
if !self.domtree if self.domtree.is_reachable(self.func.layout.pp_ebb(loc_inst)) &&
!self.domtree
.dominates(def_inst, loc_inst, &self.func.layout) { .dominates(def_inst, loc_inst, &self.func.layout) {
return err!(loc_inst, "uses value from non-dominating {}", def_inst); return err!(loc_inst, "uses value from non-dominating {}", def_inst);
} }
@@ -381,7 +382,8 @@ impl<'a> Verifier<'a> {
ebb); ebb);
} }
// The defining EBB dominates the instruction using this value. // The defining EBB dominates the instruction using this value.
if !self.domtree.dominates(ebb, loc_inst, &self.func.layout) { if self.domtree.is_reachable(ebb) &&
!self.domtree.dominates(ebb, loc_inst, &self.func.layout) {
return err!(loc_inst, "uses value arg from non-dominating {}", ebb); return err!(loc_inst, "uses value arg from non-dominating {}", ebb);
} }
} }