From 99f25ab63a56a92d7e92c6ae01c13c5bbbefd578 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 23 Oct 2016 13:21:41 +0800 Subject: MIR Gen - Use the `m_yeild_final` flag in _Block --- src/mir/from_hir.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mir/from_hir.cpp b/src/mir/from_hir.cpp index 95c664b2..cac498b1 100644 --- a/src/mir/from_hir.cpp +++ b/src/mir/from_hir.cpp @@ -348,7 +348,12 @@ namespace { // Result from last node (if it didn't diverge) if( res_valid ) { - m_builder.set_result( node.span(), mv$(res) ); + if( node.m_yields_final ) { + m_builder.set_result( node.span(), mv$(res) ); + } + else { + m_builder.set_result(node.span(), ::MIR::RValue::make_Tuple({})); + } } } else -- cgit v1.2.3