Merge pull request #2070 from Shaikh-Ubaid/ifexp_llvm

LLVM: Fix visit_IfExp()

Author: ubaidsk

integration_tests/CMakeLists.txt

@@ -554,7 +554,8 @@ RUN(NAME test_global         LABELS cpython llvm c)
 RUN(NAME test_global_decl    LABELS cpython llvm c)
 RUN(NAME test_integer_bitnot LABELS cpython llvm c wasm)
 RUN(NAME test_unsign_int_bitnot LABELS cpython llvm c)
-RUN(NAME test_ifexp          LABELS cpython llvm c)
+RUN(NAME test_ifexp_01          LABELS cpython llvm c)
+RUN(NAME test_ifexp_02          LABELS cpython llvm c)
 RUN(NAME test_unary_minus    LABELS cpython llvm c)
 RUN(NAME test_unary_plus     LABELS cpython llvm c)
 RUN(NAME test_bool_binop     LABELS cpython llvm c)

integration_tests/test_ifexp.py integration_tests/test_ifexp_01.pyintegration_tests/test_ifexp.py renamed to integration_tests/test_ifexp_01.py

@@ -0,0 +1,17 @@
+from lpython import i32
+
+def g() -> i32:
+    return 10
+
+def f():
+    i: i32
+    j: i32
+    k: i32
+    i = 5
+    j = 6
+    k = g() if i > j else g() - 1
+
+    print(k)
+    assert k == 9
+
+f()

integration_tests/test_ifexp_02.py

@@ -5667,15 +5667,10 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
         // IfExp(expr test, expr body, expr orelse, ttype type, expr? value)
         this->visit_expr_wrapper(x.m_test, true);
         llvm::Value *cond = tmp;
-        llvm::Value *then_val = nullptr;
-        llvm::Value *else_val = nullptr;
-        llvm_utils->create_if_else(cond, [=, &then_val]() {
-            this->visit_expr_wrapper(x.m_body, true);
-            then_val = tmp;
-        }, [=, &else_val]() {
-            this->visit_expr_wrapper(x.m_orelse, true);
-            else_val = tmp;
-        });
+        this->visit_expr_wrapper(x.m_body, true);
+        llvm::Value *then_val = tmp;
+        this->visit_expr_wrapper(x.m_orelse, true);
+        llvm::Value *else_val = tmp;
         tmp = builder->CreateSelect(cond, then_val, else_val);
     }