Merge remote-tracking branch 'origin/val-fix' into codegen-meri

Author: Segelente

lib/src/codegen/ir.rs

@@ -740,7 +740,10 @@ fn generate_code_stmt(
                         is_last_instr,
                     );
                     let body_len = get_instructions_length(&body) as i16;
-                    result.push(Instruction::ifeq(3 + body_len, body.len() as i16 + 1));
+                    result.push(Instruction::ifeq(
+                        2 + 1 + 3 + body_len,
+                        body.len() as i16 + 2,
+                    ));
                     result.append(&mut body);
                     result.push(Instruction::goto(
                         -3 - body_len - cond_len,

lib/src/codegen/stack.rs

@@ -438,7 +438,10 @@ impl StackMapFrame {
                 v
             }
             StackMapFrame::CHOP(chopped_amount, offset_delta) => {
-                todo!()
+                let mut v = Vec::with_capacity(8);
+                v.push(*chopped_amount);
+                v.extend_from_slice(&offset_delta.to_be_bytes());
+                v
             }
             StackMapFrame::APPEND(appended_amount, offset_delta, types) => {
                 let mut v = Vec::with_capacity(16);

lib/src/tests/fib_class.rs

@@ -217,6 +217,23 @@ fn fib_class() -> Class {
                             ))),
                             Type::Int,
                         ),
+                        TypedStmt(
+                            Box::new(LocalVarDecl(Type::Int, "next".to_string())),
+                            Type::Int,
+                        ),
+                        TypedStmt(
+                            Box::new(StmtExprStmt(TypedStmtExpr(
+                                Box::new(Assign(
+                                    Expr::TypedExpr(
+                                        Box::new(Expr::LocalVar("next".to_string())),
+                                        Type::Int,
+                                    ),
+                                    TypedExpr(Box::new(Expr::Integer(0)), Type::Int),
+                                )),
+                                Type::Int,
+                            ))),
+                            Type::Int,
+                        ),
                         TypedStmt(
                             Box::new(While(
                                 TypedExpr(
@@ -235,10 +252,6 @@ fn fib_class() -> Class {
                                 ),
                                 Box::new(TypedStmt(
                                     Box::new(Block(vec![
-                                        TypedStmt(
-                                            Box::new(LocalVarDecl(Type::Int, "next".to_string())),
-                                            Type::Int,
-                                        ),
                                         TypedStmt(
                                             Box::new(StmtExprStmt(TypedStmtExpr(
                                                 Box::new(Assign(

lib/testcases/Fib.java

@@ -14,8 +14,9 @@ int iter(int n) {
 		int x = 0;
 		int y = 1;
 		int i = 1;
+		int next = 0;
 		while (i < n) {
-			int next = y + x;
+			next = y + x;
 			x = y;
 			y = next;
 			i = i + 1;