From b7e694d09c5abcc0a0444910b06137fe9be29b65 Mon Sep 17 00:00:00 2001
From: ychenfo <yc@m-labs.hk>
Date: Mon, 28 Mar 2022 23:12:30 +0800
Subject: [PATCH] nac3core: fix broken tests

---
 nac3core/src/codegen/expr.rs | 14 ++++++++++----
 nac3core/src/codegen/test.rs | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/nac3core/src/codegen/expr.rs b/nac3core/src/codegen/expr.rs
index 1860766..09ae312 100644
--- a/nac3core/src/codegen/expr.rs
+++ b/nac3core/src/codegen/expr.rs
@@ -1240,17 +1240,23 @@ pub fn gen_expr<'ctx, 'a, G: CodeGenerator>(
             let cont_bb = ctx.ctx.append_basic_block(current, "cont");
             ctx.builder.build_conditional_branch(test, then_bb, else_bb);
             ctx.builder.position_at_end(then_bb);
-            let a = generator.gen_expr(ctx, body)?.unwrap().to_basic_value_enum(ctx, generator)?;
+            let a = generator.gen_expr(ctx, body)?;
             match result {
                 None => None,
-                Some(v) => Some(ctx.builder.build_store(v, a))
+                Some(v) => {
+                    let a = a.unwrap().to_basic_value_enum(ctx, generator)?;
+                    Some(ctx.builder.build_store(v, a))
+                }
             };
             ctx.builder.build_unconditional_branch(cont_bb);
             ctx.builder.position_at_end(else_bb);
-            let b = generator.gen_expr(ctx, orelse)?.unwrap().to_basic_value_enum(ctx, generator)?;
+            let b = generator.gen_expr(ctx, orelse)?;
             match result {
                 None => None,
-                Some(v) => Some(ctx.builder.build_store(v, b))
+                Some(v) => {
+                    let b = b.unwrap().to_basic_value_enum(ctx, generator)?;
+                    Some(ctx.builder.build_store(v, b))
+                }
             };
             ctx.builder.build_unconditional_branch(cont_bb);
             ctx.builder.position_at_end(cont_bb);
diff --git a/nac3core/src/codegen/test.rs b/nac3core/src/codegen/test.rs
index f1ca538..9b55e87 100644
--- a/nac3core/src/codegen/test.rs
+++ b/nac3core/src/codegen/test.rs
@@ -180,13 +180,22 @@ fn test_primitives() {
         let expected = indoc! {"
             ; ModuleID = 'test'
             source_filename = \"test\"
-
+            
             define i32 @testing(i32 %0, i32 %1) {
             init:
               %add = add i32 %0, %1
               %cmp = icmp eq i32 %add, 1
-              %ifexpr = select i1 %cmp, i32 %0, i32 0
-              ret i32 %ifexpr
+              br i1 %cmp, label %then, label %else
+            
+            then:                                             ; preds = %init
+              br label %cont
+            
+            else:                                             ; preds = %init
+              br label %cont
+            
+            cont:                                             ; preds = %else, %then
+              %if_exp_result.0 = phi i32 [ %0, %then ], [ 0, %else ]
+              ret i32 %if_exp_result.0
             }
        "}
         .trim();