MIR Gen - Misc fixes for drop order quirks

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mir/from_hir.cpp b/src/mir/from_hir.cpp
index 272cea48..c50806f5 100644
--- a/src/mir/from_hir.cpp
+++ b/src/mir/from_hir.cpp
@@ -1804,7 +1804,11 @@ namespace {
                 assert( !values_set[idx] );
                 values_set[idx] = true;
                 this->visit_node_ptr(valnode);
-                values.at(idx) = m_builder.lvalue_or_temp( valnode->span(), valnode->m_res_type, m_builder.get_result(valnode->span()) );
+                
+                // NOTE: Have to allocate a new temporary because ordering matters
+                auto tmp = m_builder.new_temporary(valnode->m_res_type);
+                m_builder.push_stmt_assign( valnode->span(), tmp.clone(), m_builder.get_result(valnode->span()) );
+                values.at(idx) = mv$(tmp);
             }
             for(unsigned int i = 0; i < values.size(); i ++)
             {