summaryrefslogtreecommitdiff
path: root/src/mir/from_hir.hpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-08-24 11:31:57 +0800
committerJohn Hodge <tpg@mutabah.net>2016-08-24 11:31:57 +0800
commit280af9e9346bfd78a0c6f2fdd817f808a74363f2 (patch)
tree0d02073e540731e977fdd17df0a6d8ea4a9e0400 /src/mir/from_hir.hpp
parent62a2bde2e87b4ac0789848b5b9ec54e91de15238 (diff)
downloadmrust-280af9e9346bfd78a0c6f2fdd817f808a74363f2.tar.gz
MIR Gen - Move variable states to function state (instead of scope)
Diffstat (limited to 'src/mir/from_hir.hpp')
-rw-r--r--src/mir/from_hir.hpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mir/from_hir.hpp b/src/mir/from_hir.hpp
index 93100b44..6153ac9f 100644
--- a/src/mir/from_hir.hpp
+++ b/src/mir/from_hir.hpp
@@ -57,11 +57,9 @@ struct SplitArm {
TAGGED_UNION(ScopeType, Variables,
(Variables, struct {
::std::vector<unsigned int> vars; // List of owned variables
- ::std::vector<VarState> var_states; // Indexed by position in above list
}),
(Temporaries, struct {
::std::vector<unsigned int> temporaries; // Controlled temporaries
- ::std::vector<VarState> states; // Indexed by position in above list
}),
(Split, struct {
::std::vector<SplitArm> arms;
@@ -85,8 +83,8 @@ class MirBuilder
::MIR::RValue m_result;
bool m_result_valid;
- ::std::vector<bool> variables_valid;
- ::std::vector<bool> temporaries_valid;
+ ::std::vector<VarState> m_variable_states;
+ ::std::vector<VarState> m_temporary_states;
struct ScopeDef
{