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

Remove macros from verifier; fixes #1248

Browse Source 
This removes `report!`, `fatal!`, and `nonfatal!` from the verifier code and replaces them with methods on `VerifierErrors`. In order to maintain similar ease-of-use, `VerifierError` is expanded with several `From` implementations that convert a tuple to a verifier error.
This commit is contained in:
Andrew Brown
2019-11-20 14:17:04 -08:00
parent e1e4e0bfc6
commit 3e5f039333
5 changed files with 585 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
cranelift/codegen/src/verifier/cssa.rs
View File

@@ -65,13 +65,13 @@ impl<'a> CssaVerifier<'a> {
for (idx, &val) in values.iter().enumerate() {
if !self.func.dfg.value_is_valid(val) {
return fatal!(errors, val, "Invalid value in {}", vreg);
return errors.fatal((val, format!("Invalid value in {}", vreg)));
}
if !self.func.dfg.value_is_attached(val) {
return fatal!(errors, val, "Detached value in {}", vreg);
return errors.fatal((val, format!("Detached value in {}", vreg)));
}
if self.liveness.get(val).is_none() {
return fatal!(errors, val, "Value in {} has no live range", vreg);
return errors.fatal((val, format!("Value in {} has no live range", vreg)));
};
// Check topological ordering with the previous values in the virtual register.
@@ -82,29 +82,31 @@ impl<'a> CssaVerifier<'a> {
let prev_ebb = self.func.layout.pp_ebb(prev_def);
if prev_def == def {
return fatal!(
errors,
return errors.fatal((
val,
"Values {} and {} in {} = {} defined at the same program point",
prev_val,
val,
vreg,
DisplayList(values)
);
format!(
"Values {} and {} in {} = {} defined at the same program point",
prev_val,
val,
vreg,
DisplayList(values)
),
));
}
// Enforce topological ordering of defs in the virtual register.
if self.preorder.dominates(def_ebb, prev_ebb)
&& self.domtree.dominates(def, prev_def, &self.func.layout)
{
return fatal!(
errors,
return errors.fatal((
val,
"Value in {} = {} def dominates previous {}",
vreg,
DisplayList(values),
prev_val
);
format!(
"Value in {} = {} def dominates previous {}",
vreg,
DisplayList(values),
prev_val
),
));
}
}
@@ -119,14 +121,15 @@ impl<'a> CssaVerifier<'a> {
&& self.domtree.dominates(prev_def, def, &self.func.layout)
{
if self.liveness[prev_val].overlaps_def(def, def_ebb, &self.func.layout) {
return fatal!(
errors,
return errors.fatal((
val,
"Value def in {} = {} interferes with {}",
vreg,
DisplayList(values),
prev_val
);
format!(
"Value def in {} = {} interferes with {}",
vreg,
DisplayList(values),
prev_val
),
));
} else {
break;
}
@@ -152,13 +155,13 @@ impl<'a> CssaVerifier<'a> {
for (&ebb_param, &pred_arg) in ebb_params.iter().zip(pred_args) {
if !self.virtregs.same_class(ebb_param, pred_arg) {
return fatal!(
errors,
return errors.fatal((
pred,
"{} and {} must be in the same virtual register",
ebb_param,
pred_arg
);
format!(
"{} and {} must be in the same virtual register",
ebb_param, pred_arg
),
));
}
}
}