mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

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 c09ad9a3a6
commit b71b4e6f14
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/src/compile.rs
View File

@@ -842,15 +842,21 @@ impl<O: OutputStream> Compiler<O> {
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:
self.emit(Instruction::LoadConst {
value: bytecode::Constant::None,
});
self.emit(Instruction::ReturnValue);
match body.last().map(|s| &s.node) {
Some(ast::StatementType::Return { .. }) => {}
_ => {
self.emit(Instruction::LoadConst {
value: bytecode::Constant::None,
});
self.emit(Instruction::ReturnValue);
}
}
let code = self.pop_code_object();
self.leave_scope();