From b79b7009f8a7f0a0e0d3c3f701fa7851e6b93927 Mon Sep 17 00:00:00 2001 From: Andreas Zwinkau Date: Fri, 6 May 2011 13:38:54 +0200 Subject: [PATCH] Use mode from type instead of return value Also bugfix: The second case used uninitialized memory for the Bad's mode. --- ir/opt/opt_inline.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ir/opt/opt_inline.c b/ir/opt/opt_inline.c index d400a728b..5c6f7116b 100644 --- a/ir/opt/opt_inline.c +++ b/ir/opt/opt_inline.c @@ -532,11 +532,9 @@ int inline_method(ir_node *call, ir_graph *called_graph) } } if (n_ret > 0) { - ir_mode *mode = get_irn_mode(cf_pred[0]); - phi = new_r_Phi(post_bl, n_ret, cf_pred, mode); + phi = new_r_Phi(post_bl, n_ret, cf_pred, res_mode); } else { - ir_mode *mode = get_irn_mode(cf_pred[0]); - phi = new_r_Bad(irg, mode); + phi = new_r_Bad(irg, res_mode); } res_pred[j] = phi; /* Conserve Phi-list for further inlinings -- but might be optimized */ -- 2.20.1