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

remove unreachable! + cargo fmt

Browse Source
This commit is contained in:
Patrick Ventuzelo
2019-12-05 13:24:33 +01:00
parent 07c850051d
commit 362469e5a9
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/lightbeam/src/backend.rs
View File

@@ -3064,7 +3064,7 @@ impl<'this, M: ModuleContext> Context<'this, M> {
Ok(()) Ok(())
} }
pub fn apply_cc(&mut self, cc: &BlockCallingConvention) -> Result<(), Error>{ pub fn apply_cc(&mut self, cc: &BlockCallingConvention) -> Result<(), Error> {
let stack = cc.arguments.iter(); let stack = cc.arguments.iter();
self.block_state.stack = Vec::with_capacity(stack.size_hint().0); self.block_state.stack = Vec::with_capacity(stack.size_hint().0);
@@ -3779,7 +3779,11 @@ impl<'this, M: ModuleContext> Context<'this, M> {
); );
} }
ValueLocation::Cond(_) => self.copy_value(val, CCLoc::Reg(new_reg))?, ValueLocation::Cond(_) => self.copy_value(val, CCLoc::Reg(new_reg))?,
ValueLocation::Immediate(_) => unreachable!(), ValueLocation::Immediate(_) => {
return Err(Error::Microwasm(
"i32_extend_u unreachable code".to_string(),
))
}
} }
ValueLocation::Reg(new_reg) ValueLocation::Reg(new_reg)
@@ -5575,7 +5579,10 @@ impl<'this, M: ModuleContext> Context<'this, M> {
Ok(()) Ok(())
} }
fn push_function_returns(&mut self, returns: impl IntoIterator<Item = SignlessType>) -> Result<(), Error>{ fn push_function_returns(
&mut self,
returns: impl IntoIterator<Item = SignlessType>,
) -> Result<(), Error> {
for loc in ret_locs(returns) { for loc in ret_locs(returns) {
if let CCLoc::Reg(reg) = loc { if let CCLoc::Reg(reg) = loc {
self.block_state.regs.mark_used(reg); self.block_state.regs.mark_used(reg);
@@ -5810,7 +5817,10 @@ impl<'this, M: ModuleContext> Context<'this, M> {
// TODO: Reserve space to store RBX, RBP, and R12..R15 so we can use them // TODO: Reserve space to store RBX, RBP, and R12..R15 so we can use them
// as scratch registers // as scratch registers
/// Writes the function prologue and stores the arguments as locals /// Writes the function prologue and stores the arguments as locals
pub fn start_function(&mut self, params: impl IntoIterator<Item = SignlessType>) -> Result<(), Error> { pub fn start_function(
&mut self,
params: impl IntoIterator<Item = SignlessType>,
) -> Result<(), Error> {
let locs = Vec::from_iter(arg_locs(params)); let locs = Vec::from_iter(arg_locs(params));
self.apply_cc(&BlockCallingConvention::function_start(locs))?; self.apply_cc(&BlockCallingConvention::function_start(locs))?;