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

Avoid unneeded calls to .as_slice().

Browse Source
This commit is contained in:
Dan Gohman
2017-09-01 10:12:23 -07:00
parent 9d2fbdae62
commit fe12fe0e63
4 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cretonne/src/regalloc/solver.rs
View File

@@ -649,7 +649,7 @@ impl Solver {
|v| v.from != v.to, |v| v.from != v.to,
)); ));
dbg!("collect_moves: {}", DisplayList(self.moves.as_slice())); dbg!("collect_moves: {}", DisplayList(&self.moves));
} }
/// Try to schedule a sequence of `regmove` instructions that will shuffle registers into /// Try to schedule a sequence of `regmove` instructions that will shuffle registers into
@@ -751,8 +751,8 @@ impl fmt::Display for Solver {
" assignments: {}", " assignments: {}",
DisplayList(self.assignments.as_slice()) DisplayList(self.assignments.as_slice())
)?; )?;
writeln!(f, " vars: {}", DisplayList(self.vars.as_slice()))?; writeln!(f, " vars: {}", DisplayList(&self.vars))?;
writeln!(f, " moves: {}", DisplayList(self.moves.as_slice()))?; writeln!(f, " moves: {}", DisplayList(&self.moves))?;
writeln!(f, "}}") writeln!(f, "}}")
} }
} }

3
lib/frontend/src/frontend.rs
View File

@@ -141,8 +141,7 @@ impl<'short, 'long, Variable> InstBuilderBase<'short> for FuncInstBuilder<'short
} }
_ => panic!("should not happen"), _ => panic!("should not happen"),
}; };
self.builder self.builder.ebb_args_adjustement(dest_ebb, &args_types);
.ebb_args_adjustement(dest_ebb, args_types.as_slice());
self.builder.declare_successor(dest_ebb, inst); self.builder.declare_successor(dest_ebb, inst);
} }
None => { None => {

37
lib/wasm/src/code_translator.rs
View File

@@ -75,7 +75,7 @@ impl ControlStackFrame {
match *self { match *self {
ControlStackFrame::If { ref return_values, .. } | ControlStackFrame::If { ref return_values, .. } |
ControlStackFrame::Block { ref return_values, .. } | ControlStackFrame::Block { ref return_values, .. } |
ControlStackFrame::Loop { ref return_values, .. } => return_values.as_slice(), ControlStackFrame::Loop { ref return_values, .. } => &return_values,
} }
} }
fn following_code(&self) -> Ebb { fn following_code(&self) -> Ebb {
@@ -264,7 +264,7 @@ pub fn translate_function_body(
if !builder.is_filled() && (!builder.is_unreachable() || !builder.is_pristine()) { if !builder.is_filled() && (!builder.is_unreachable() || !builder.is_pristine()) {
let cut_index = stack.len() - sig.return_types.len(); let cut_index = stack.len() - sig.return_types.len();
let return_vals = stack.split_off(cut_index); let return_vals = stack.split_off(cut_index);
builder.ins().return_(return_vals.as_slice()); builder.ins().return_(&return_vals);
} }
// Because the function has an implicit block as body, we need to explicitely close it. // Because the function has an implicit block as body, we need to explicitely close it.
let frame = control_stack.pop().unwrap(); let frame = control_stack.pop().unwrap();
@@ -276,7 +276,7 @@ pub fn translate_function_body(
stack.extend_from_slice(builder.ebb_args(frame.following_code())); stack.extend_from_slice(builder.ebb_args(frame.following_code()));
let cut_index = stack.len() - sig.return_types.len(); let cut_index = stack.len() - sig.return_types.len();
let return_vals = stack.split_off(cut_index); let return_vals = stack.split_off(cut_index);
builder.ins().return_(return_vals.as_slice()); builder.ins().return_(&return_vals);
} }
} }
Ok((func, func_imports)) Ok((func, func_imports))
@@ -418,7 +418,7 @@ fn translate_operator(
}; };
let cut_index = stack.len() - return_values.len(); let cut_index = stack.len() - return_values.len();
let jump_args = stack.split_off(cut_index); let jump_args = stack.split_off(cut_index);
builder.ins().jump(destination, jump_args.as_slice()); builder.ins().jump(destination, &jump_args);
// We change the target of the branch instruction // We change the target of the branch instruction
let else_ebb = builder.create_ebb(); let else_ebb = builder.create_ebb();
builder.change_jump_destination(branch_inst, else_ebb); builder.change_jump_destination(branch_inst, else_ebb);
@@ -430,10 +430,7 @@ fn translate_operator(
if !builder.is_unreachable() || !builder.is_pristine() { if !builder.is_unreachable() || !builder.is_pristine() {
let cut_index = stack.len() - frame.return_values().len(); let cut_index = stack.len() - frame.return_values().len();
let jump_args = stack.split_off(cut_index); let jump_args = stack.split_off(cut_index);
builder.ins().jump( builder.ins().jump(frame.following_code(), &jump_args);
frame.following_code(),
jump_args.as_slice(),
);
} }
builder.switch_to_block(frame.following_code(), frame.return_values()); builder.switch_to_block(frame.following_code(), frame.return_values());
builder.seal_block(frame.following_code()); builder.seal_block(frame.following_code());
@@ -475,10 +472,7 @@ fn translate_operator(
let cut_index = stack.len() - frame.return_values().len(); let cut_index = stack.len() - frame.return_values().len();
stack.split_off(cut_index) stack.split_off(cut_index)
}; };
builder.ins().jump( builder.ins().jump(frame.br_destination(), &jump_args);
frame.br_destination(),
jump_args.as_slice(),
);
// We signal that all the code that follows until the next End is unreachable // We signal that all the code that follows until the next End is unreachable
frame.set_reachable(); frame.set_reachable();
state.real_unreachable_stack_depth = 1 + relative_depth as usize; state.real_unreachable_stack_depth = 1 + relative_depth as usize;
@@ -493,11 +487,7 @@ fn translate_operator(
let cut_index = stack.len() - frame.return_values().len(); let cut_index = stack.len() - frame.return_values().len();
stack.split_off(cut_index) stack.split_off(cut_index)
}; };
builder.ins().brnz( builder.ins().brnz(val, frame.br_destination(), &jump_args);
val,
frame.br_destination(),
jump_args.as_slice(),
);
// The values returned by the branch are still available for the reachable // The values returned by the branch are still available for the reachable
// code that comes after it // code that comes after it
frame.set_reachable(); frame.set_reachable();
@@ -561,7 +551,7 @@ fn translate_operator(
builder.ins().br_table(val, jt); builder.ins().br_table(val, jt);
let default_ebb = control_stack[control_stack.len() - 1 - (default as usize)] let default_ebb = control_stack[control_stack.len() - 1 - (default as usize)]
.br_destination(); .br_destination();
builder.ins().jump(default_ebb, jump_args.as_slice()); builder.ins().jump(default_ebb, &jump_args);
stack.extend_from_slice(&jump_args); stack.extend_from_slice(&jump_args);
for (depth, dest_ebb) in dest_ebbs { for (depth, dest_ebb) in dest_ebbs {
builder.switch_to_block(dest_ebb, &[]); builder.switch_to_block(dest_ebb, &[]);
@@ -569,7 +559,7 @@ fn translate_operator(
let i = control_stack.len() - 1 - depth; let i = control_stack.len() - 1 - depth;
let frame = &mut control_stack[i]; let frame = &mut control_stack[i];
let real_dest_ebb = frame.br_destination(); let real_dest_ebb = frame.br_destination();
builder.ins().jump(real_dest_ebb, jump_args.as_slice()); builder.ins().jump(real_dest_ebb, &jump_args);
frame.set_reachable(); frame.set_reachable();
} }
state.real_unreachable_stack_depth = 1 + min_depth as usize; state.real_unreachable_stack_depth = 1 + min_depth as usize;
@@ -579,7 +569,7 @@ fn translate_operator(
let return_count = sig.return_types.len(); let return_count = sig.return_types.len();
let cut_index = stack.len() - return_count; let cut_index = stack.len() - return_count;
let return_args = stack.split_off(cut_index); let return_args = stack.split_off(cut_index);
builder.ins().return_(return_args.as_slice()); builder.ins().return_(&return_args);
state.real_unreachable_stack_depth = 1; state.real_unreachable_stack_depth = 1;
} }
/************************************ Calls **************************************** /************************************ Calls ****************************************
@@ -599,10 +589,7 @@ fn translate_operator(
exports, exports,
signatures, signatures,
); );
let call_inst = builder.ins().call( let call_inst = builder.ins().call(internal_function_index, &call_args);
internal_function_index,
call_args.as_slice(),
);
let ret_values = builder.inst_results(call_inst); let ret_values = builder.inst_results(call_inst);
for val in ret_values { for val in ret_values {
stack.push(*val); stack.push(*val);
@@ -621,7 +608,7 @@ fn translate_operator(
let cut_index = stack.len() - args_num; let cut_index = stack.len() - args_num;
let call_args = stack.split_off(cut_index); let call_args = stack.split_off(cut_index);
let ret_values = let ret_values =
runtime.translate_call_indirect(builder, sigref, index_val, call_args.as_slice()); runtime.translate_call_indirect(builder, sigref, index_val, &call_args);
for val in ret_values { for val in ret_values {
stack.push(*val); stack.push(*val);
} }

2
lib/wasm/src/sections_translator.rs
View File

@@ -369,7 +369,7 @@ pub fn parse_elements_section(
ParserState::ElementSectionEntryBody(ref elements) => { ParserState::ElementSectionEntryBody(ref elements) => {
let elems: Vec<FunctionIndex> = let elems: Vec<FunctionIndex> =
elements.iter().map(|&x| x as FunctionIndex).collect(); elements.iter().map(|&x| x as FunctionIndex).collect();
runtime.declare_table_elements(table_index, offset, elems.as_slice()) runtime.declare_table_elements(table_index, offset, &elems)
} }
ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))), ref s => return Err(SectionParsingError::WrongSectionContent(format!("{:?}", s))),
}; };