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

Report when output register annotation is missing (#1289)

Browse Source
This commit is contained in:
Y-Nak
2019-12-17 19:28:45 +09:00
committed by Benjamin Bouvier
parent 86b66e8ede
commit 8db7349712
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
cranelift/filetests/src/test_binemit.rs
View File

@@ -231,18 +231,8 @@ impl SubTest for TestBinEmit {
// Send legal encodings into the emitter.
if enc.is_legal() {
// Generate a better error message if output locations are not specified.
if let Some(&v) = func
.dfg
.inst_results(inst)
.iter()
.find(|&&v| !func.locations[v].is_assigned())
{
return Err(format!(
"Missing register/stack slot for {} in {}",
v,
func.dfg.display_inst(inst, isa)
));
}
validate_location_annotations(&func, inst, isa, false)?;
let before = sink.offset;
isa.emit_inst(&func, inst, &mut divert, &mut sink);
let emitted = sink.offset - before;
@@ -260,19 +250,9 @@ impl SubTest for TestBinEmit {
if let Some(want) = bins.remove(&inst) {
if !enc.is_legal() {
// A possible cause of an unencoded instruction is a missing location for
// one of the input operands.
if let Some(&v) = func
.dfg
.inst_args(inst)
.iter()
.find(|&&v| !func.locations[v].is_assigned())
{
return Err(format!(
"Missing register/stack slot for {} in {}",
v,
func.dfg.display_inst(inst, isa)
));
}
// one of the input/output operands.
validate_location_annotations(&func, inst, isa, true)?;
validate_location_annotations(&func, inst, isa, false)?;
// Do any encodings exist?
let encodings = isa
@@ -337,3 +317,27 @@ impl SubTest for TestBinEmit {
Ok(())
}
}
/// Validate registers/stack slots are correctly annotated.
fn validate_location_annotations(
func: &ir::Function,
inst: ir::Inst,
isa: &dyn isa::TargetIsa,
validate_inputs: bool,
) -> SubtestResult<()> {
let values = if validate_inputs {
func.dfg.inst_args(inst)
} else {
func.dfg.inst_results(inst)
};
if let Some(&v) = values.iter().find(|&&v| !func.locations[v].is_assigned()) {
Err(format!(
"Need register/stack slot annotation for {} in {}",
v,
func.dfg.display_inst(inst, isa)
))
} else {
Ok(())
}
}