Fixes PushBlock in nested block context

Issue: #17 Issue: #92
0x7CFE · Aug 2, 2016 · 878db08 · 878db08
1 parent fc6d1dd
commit 878db08
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/TypeAnalyzer.cpp b/src/TypeAnalyzer.cpp
@@ -628,7 +628,11 @@ void TypeAnalyzer::doPushBlock(const InstructionNode& instruction) {
         blockType.pushSubType(origin);                                 // [Type::bstOrigin]
         blockType.pushSubType(Type(TInteger(offset)));                 // [Type::bstOffset]
         blockType.pushSubType(Type(TInteger(argIndex)));               // [Type::bstArgIndex]
-        blockType.pushSubType(Type(TInteger(m_context.getIndex())));   // [Type::bstContextIndex]
+
+        if (m_blockType)
+            blockType.pushSubType((*m_blockType)[Type::bstContextIndex]);
+        else
+            blockType.pushSubType(Type(TInteger(m_context.getIndex()))); // [Type::bstContextIndex]
 
         ControlGraph* const blockGraph = m_system.getBlockGraph(pushBlock->getParsedBlock());
         assert(blockGraph);