From ba03a3508bfbf83b6bbd07f47bc1573ab6f6f89f Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Wed, 18 Jun 2008 19:16:05 +0200 Subject: [PATCH] re PR rtl-optimization/35604 (Label references are not updated after edge insertion) PR rtl-optimization/35604 * jump.c (redirect_exp_1): Skip the condition of an IF_THEN_ELSE. We only want to change jump destinations, not eventual label comparisons. From-SVN: r136899 --- gcc/ChangeLog | 22 ++++++++++++++-------- gcc/jump.c | 9 +++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e6caaeb5071..842a63bb72b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-06-18 Uros Bizjak + Ian Lance Taylor + + PR rtl-optimization/35604 + * jump.c (redirect_exp_1): Skip the condition of an IF_THEN_ELSE. We + only want to change jump destinations, not eventual label comparisons. + 2008-06-16 Jan Hubicka * cgraphunit.c (cgraph_expand_pending_functions): Give up at @@ -436,8 +443,7 @@ 2008-06-12 Jakub Jelinek PR middle-end/36506 - * omp-low.c (expand_omp_sections): Initialize l2 to avoid bogus - warning. + * omp-low.c (expand_omp_sections): Initialize l2 to avoid bogus warning. 2008-06-12 Eric Botcazou @@ -482,8 +488,8 @@ 2008-06-12 Kai Tietz - * config/i386/i386.c (ix86_compute_frame_layout): Disable red zone for - w64 abi. + * config/i386/i386.c (ix86_compute_frame_layout): Disable + red zone for w64 abi. (ix86_expand_prologue): Likewise. (ix86_force_to_memory): Likewise. (ix86_free_from_memory): Likewise. @@ -492,8 +498,7 @@ PR target/36425 * config/rs6000/rs6000.c (rs6000_override_options): Set - rs6000_isel conditionally to the absence of comand line - override. + rs6000_isel conditionally to the absence of comand line override. * config/rs6000/linuxspe.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Remove duplicate rs6000_isel setting. * config/rs6000/eabispe.h: Ditto. @@ -524,7 +529,7 @@ arch_32 and arch_64. 2008-06-11 Eric Botcazou - Olivier Hainque + Olivier Hainque * builtins.c (get_memory_rtx): Accept byte-addressable bitfields. Use DECL_SIZE_UNIT to retrieve the size of the field. @@ -559,7 +564,8 @@ and target endianness differ. 2008-06-10 Vinodha Ramasamy - * value_prob.c (tree_divmod_fixed_value_transform): Use gcov_type. + + * value_prob.c (tree_divmod_fixed_value_transform): Use gcov_type. Avoid division by 0. (tree_mod_pow2_value_transform): Likewise. (tree_ic_transform): Likewise. diff --git a/gcc/jump.c b/gcc/jump.c index 1aa0c6db6d8..23d183e932c 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -1327,6 +1327,15 @@ redirect_exp_1 (rtx *loc, rtx olabel, rtx nlabel, rtx insn) return; } + if (code == IF_THEN_ELSE) + { + /* Skip the condition of an IF_THEN_ELSE. We only want to + change jump destinations, not eventual label comparisons. */ + redirect_exp_1 (&XEXP (x, 1), olabel, nlabel, insn); + redirect_exp_1 (&XEXP (x, 2), olabel, nlabel, insn); + return; + } + fmt = GET_RTX_FORMAT (code); for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) { -- 2.30.2