WIP

Author: VedantParanjape

src/blocks/loops.cpp

@@ -380,7 +380,9 @@ stmt::Ptr loop::convert_to_ast_impl(dominator_analysis &dta_, std::vector<std::p
                     int next_preorder = dta_.get_preorder_bb_map()[bb->id] + 1 < (int)dta_.get_preorder().size() ? dta_.get_preorder()[dta_.get_preorder_bb_map()[bb->id] + 1] : -1;
                     int next_next_preorder = dta_.get_preorder_bb_map()[next_preorder] + 1 < (int)dta_.get_preorder().size() ? dta_.get_preorder()[dta_.get_preorder_bb_map()[next_preorder] + 1] : -1;
 
-                    if (blocks_id_map.count(next_preorder))
+                    if (loop_latch_blocks.size() == 1)
+                        is_last_block = true;
+                    else if (blocks_id_map.count(next_preorder))
                         is_last_block = false;
                     else {
                         if (!blocks_id_map.count(next_preorder) || !blocks_id_map.count(next_next_preorder))

src/builder/builder_context.cpp

@@ -500,13 +500,13 @@ block::stmt::Ptr builder_context::extract_ast_from_function_impl(void) {
 	std::cerr << "++++++ loop info ++++++ \n";
 
 	std::cerr << "++++++ convert to ast ++++++ \n";
-	ast = LI.convert_to_ast(block::to<block::stmt_block>(ast));
+	// ast = LI.convert_to_ast(block::to<block::stmt_block>(ast));
 	std::cerr << "++++++ convert to ast ++++++ \n";
 
-	// block::loop_finder finder;
-	// finder.ast = ast;
-	// ast->accept(&finder);
-	// return ast;
+	block::loop_finder finder;
+	finder.ast = ast;
+	ast->accept(&finder);
+	return ast;
 
 	block::for_loop_finder for_finder;
 	for_finder.ast = ast;