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

[bugpoint] Make the mutation_count non optional;

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-10-14 15:39:28 +02:00
parent 012fca61f9
commit 735d4c7aef
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cranelift/src/bugpoint.rs
View File

@@ -77,7 +77,7 @@ enum MutationKind {
trait Mutator { trait Mutator {
fn name(&self) -> &'static str; fn name(&self) -> &'static str;
fn mutation_count(&self, func: &Function) -> Option<usize>; fn mutation_count(&self, func: &Function) -> usize;
fn mutate(&mut self, func: Function) -> Option<(Function, String, MutationKind)>; fn mutate(&mut self, func: Function) -> Option<(Function, String, MutationKind)>;
} }
@@ -103,8 +103,8 @@ impl Mutator for RemoveInst {
"remove inst" "remove inst"
} }
fn mutation_count(&self, func: &Function) -> Option<usize> { fn mutation_count(&self, func: &Function) -> usize {
Some(inst_count(func)) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> {
@@ -160,8 +160,8 @@ impl Mutator for ReplaceInstWithConst {
"replace inst with const" "replace inst with const"
} }
fn mutation_count(&self, func: &Function) -> Option<usize> { fn mutation_count(&self, func: &Function) -> usize {
Some(inst_count(func)) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> {
@@ -243,8 +243,8 @@ impl Mutator for ReplaceInstWithTrap {
"replace inst with trap" "replace inst with trap"
} }
fn mutation_count(&self, func: &Function) -> Option<usize> { fn mutation_count(&self, func: &Function) -> usize {
Some(inst_count(func)) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> {
@@ -277,8 +277,8 @@ impl Mutator for RemoveEbb {
"remove ebb" "remove ebb"
} }
fn mutation_count(&self, func: &Function) -> Option<usize> { fn mutation_count(&self, func: &Function) -> usize {
Some(ebb_count(func)) ebb_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> {
@@ -313,8 +313,8 @@ impl Mutator for RemoveUnusedEntities {
"remove unused entities" "remove unused entities"
} }
fn mutation_count(&self, _func: &Function) -> Option<usize> { fn mutation_count(&self, _func: &Function) -> usize {
Some(4) 4
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> {
@@ -606,7 +606,7 @@ fn reduce(
}; };
progress_bar.set_prefix(&format!("pass {} phase {}", pass_idx, mutator.name())); progress_bar.set_prefix(&format!("pass {} phase {}", pass_idx, mutator.name()));
progress_bar.set_length(mutator.mutation_count(&func).unwrap() as u64); progress_bar.set_length(mutator.mutation_count(&func) as u64);
// Reset progress bar. // Reset progress bar.
progress_bar.set_position(0); progress_bar.set_position(0);