From d4f5ef046da7d1d3402f671e84fa483c71a3b26f Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 8 Sep 2021 11:58:01 +0100 Subject: [PATCH] Remove `goto` in favour of multiple exits --- src/llvm_backend_expr.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/llvm_backend_expr.cpp b/src/llvm_backend_expr.cpp index 8e632d5bc..8189aec68 100644 --- a/src/llvm_backend_expr.cpp +++ b/src/llvm_backend_expr.cpp @@ -71,7 +71,10 @@ lbValue lb_emit_logical_binary_expr(lbProcedure *p, TokenKind op, Ast *left, Ast if (phi_type == nullptr) { phi = LLVMBuildPhi(p->builder, dst_type, ""); LLVMAddIncoming(phi, incoming_values.data, incoming_blocks.data, cast(unsigned)incoming_values.count); - goto phi_end; + lbValue res = {}; + res.type = type; + res.value = phi; + return res; } for_array(i, incoming_values) { @@ -102,7 +105,6 @@ lbValue lb_emit_logical_binary_expr(lbProcedure *p, TokenKind op, Ast *left, Ast phi = LLVMBuildTruncOrBitCast(p->builder, phi, dst_type, ""); } -phi_end:; lbValue res = {}; res.type = type; res.value = phi;