mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-15 00:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't emit None, ReturnValue if the last statement in a function is a return

Browse source
This commit is contained in:
coolreader18 2019-09-14 15:16:02 -05:00 • committed by Windel Bouwman
parent e5f6d11a12
commit b8726f03df
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/compile.rs
View file

@ -842,15 +842,21 @@ impl<O: OutputStream> Compiler<O> {
let mut flags = self.enter_function(name, args)?; let mut flags = self.enter_function(name, args)?;
let (new_body, doc_str) = get_doc(body); let (body, doc_str) = get_doc(body);
self.compile_statements(new_body)?; self.compile_statements(body)?;
// Emit None at end: // Emit None at end:
self.emit(Instruction::LoadConst { match body.last().map(|s| &s.node) {
value: bytecode::Constant::None, Some(ast::StatementType::Return { .. }) => {}
}); _ => {
self.emit(Instruction::ReturnValue); self.emit(Instruction::LoadConst {
value: bytecode::Constant::None,
});
self.emit(Instruction::ReturnValue);
}
}
let code = self.pop_code_object(); let code = self.pop_code_object();
self.leave_scope(); self.leave_scope();