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/mir/helpers.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/mir/helpers.hpp')

diff --git a/src/mir/helpers.hpp b/src/mir/helpers.hpp
index 802ce88f..091a669f 100644
--- a/src/mir/helpers.hpp
+++ b/src/mir/helpers.hpp
@@ -158,14 +158,10 @@ public:
 struct ValueLifetimes
 {
     ::std::vector<size_t>   m_block_offsets;
-    ::std::vector<ValueLifetime> m_temporaries;
-    ::std::vector<ValueLifetime> m_variables;
+    ::std::vector<ValueLifetime> m_slots;
 
-    bool var_valid(unsigned var_idx,  unsigned bb_idx, unsigned stmt_idx) const {
-        return m_variables.at(var_idx).valid_at( m_block_offsets[bb_idx] + stmt_idx );
-    }
-    bool tmp_valid(unsigned tmp_idx,  unsigned bb_idx, unsigned stmt_idx) const {
-        return m_temporaries.at(tmp_idx).valid_at( m_block_offsets[bb_idx] + stmt_idx );
+    bool slot_valid(unsigned idx,  unsigned bb_idx, unsigned stmt_idx) const {
+        return m_slots.at(idx).valid_at( m_block_offsets[bb_idx] + stmt_idx );
     }
 };
 
-- 
cgit v1.2.3