Remove unnecessary blocks

Author: RobDangerous

sources/compiler.c

@@ -803,24 +803,28 @@ static block_ids emit_statement(opcodes *code, block *parent, statement *stateme
 			statement->block.vars.v[i].variable_id = var.index;
 		}
 
+		bool     loop_block;
 		uint64_t start_block_id;
 		if (block_start_id != 0) {
 			start_block_id = block_start_id;
+			loop_block     = true;
 		}
 		else {
 			start_block_id = next_variable_id;
 			++next_variable_id;
+			loop_block = false;
 		}
 
 		uint64_t end_block_id = next_variable_id;
 		++next_variable_id;
 
 		{
 			opcode o;
-			o.type              = OPCODE_BLOCK_START;
-			o.op_block.start_id = start_block_id;
-			o.op_block.end_id   = end_block_id;
-			o.size              = OP_SIZE(o, op_block);
+			o.type                = OPCODE_BLOCK_START;
+			o.op_block.start_id   = start_block_id;
+			o.op_block.end_id     = end_block_id;
+			o.op_block.loop_block = loop_block;
+			o.size                = OP_SIZE(o, op_block);
 			emit_op(code, &o);
 		}
 
@@ -830,10 +834,11 @@ static block_ids emit_statement(opcodes *code, block *parent, statement *stateme
 
 		{
 			opcode o;
-			o.type              = OPCODE_BLOCK_END;
-			o.op_block.start_id = start_block_id;
-			o.op_block.end_id   = end_block_id;
-			o.size              = OP_SIZE(o, op_block);
+			o.type                = OPCODE_BLOCK_END;
+			o.op_block.start_id   = start_block_id;
+			o.op_block.end_id     = end_block_id;
+			o.op_block.loop_block = loop_block;
+			o.size                = OP_SIZE(o, op_block);
 			emit_op(code, &o);
 		}
 

sources/compiler.h

@@ -170,6 +170,7 @@ typedef struct opcode {
 		struct {
 			uint64_t start_id;
 			uint64_t end_id;
+			bool     loop_block;
 		} op_block;
 		struct {
 			uint8_t nothing;

sources/transformer.c

@@ -37,6 +37,17 @@ void transform(uint32_t flags) {
 			opcode *o = (opcode *)&data[index];
 
 			switch (o->type) {
+			case OPCODE_BLOCK_START:
+			case OPCODE_BLOCK_END:
+				if ((flags & TRANSFORM_FLAG_REDUCE_BLOCKS) != 0) {
+					if (o->op_block.loop_block) {
+						copy_opcode(o);
+					}
+				}
+				else {
+					copy_opcode(o);
+				}
+				break;
 			case OPCODE_STORE_ACCESS_LIST: {
 				kong_access a = o->op_store_access_list.access_list[o->op_store_access_list.access_list_size - 1];