From bbb7023bee036f87b45ba0555e60ce33837460b0 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Fri, 16 Jun 2017 10:35:30 +0800
Subject: MIR - Unify temporaries and variables

---
 src/hir_conv/bind.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/hir_conv/bind.cpp')

diff --git a/src/hir_conv/bind.cpp b/src/hir_conv/bind.cpp
index cf443eb6..1b0f61b6 100644
--- a/src/hir_conv/bind.cpp
+++ b/src/hir_conv/bind.cpp
@@ -480,14 +480,12 @@ namespace {
                     static void visit_lvalue(Visitor& upper_visitor, ::MIR::LValue& lv)
                     {
                         TU_MATCHA( (lv), (e),
-                        (Variable,
+                        (Return,
                             ),
-                        (Temporary,
+                        (Local,
                             ),
                         (Argument,
                             ),
-                        (Return,
-                            ),
                         (Static,
                             upper_visitor.visit_path(e, ::HIR::Visitor::PathContext::VALUE);
                             ),
@@ -529,9 +527,7 @@ namespace {
                         )
                     }
                 };
-                for(auto& ty : expr.m_mir->named_variables)
-                    this->visit_type(ty);
-                for(auto& ty : expr.m_mir->temporaries)
+                for(auto& ty : expr.m_mir->locals)
                     this->visit_type(ty);
                 for(auto& block : expr.m_mir->blocks)
                 {
-- 
cgit v1.2.3