From 804131d8c57d11cc58f9be6b6b11d1a547c619f6 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sun, 14 Aug 2016 11:01:28 +0800
Subject: MIR Gen Match - Fixes for a small edge case

---
 src/mir/from_hir_match.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/mir/from_hir_match.cpp')

diff --git a/src/mir/from_hir_match.cpp b/src/mir/from_hir_match.cpp
index b25584c7..029f00d9 100644
--- a/src/mir/from_hir_match.cpp
+++ b/src/mir/from_hir_match.cpp
@@ -1551,6 +1551,7 @@ void DecisionTreeNode::propagate_default()
                 if( be->m_default.is_Unset() ) {
                     be->unify_from(def);
                 }
+                be->propagate_default();
             )
         }
     };
@@ -1793,7 +1794,14 @@ void DecisionTreeGen::generate_tree_code(
 {
     TRACE_FUNCTION_F("ty=" << ty << ", ty_ofs=" << ty_ofs << ", depth="<<depth<<", node=" << node);
     
+    #if 1
+    if( depth > node.m_field_path.size() ) {
+        and_then(node);
+        return ;
+    }
+    #else
     assert( depth <= node.m_field_path.size() );
+    #endif
     
     TU_MATCHA( (ty.m_data), (e),
     (Infer,   BUG(sp, "Ivar for in match type"); ),
-- 
cgit v1.2.3