From cc2999aaf6d6661c2ffa3443b84c0d665f2a1d04 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 12 Sep 2000 19:06:05 +0000 Subject: [PATCH] Fix ia64-linux glibc intl/loadmsgcat.c miscompilation. * ifcvt.c (noce_process_if_block): If A and B are the same, and no else block, and X has side-effects, then fail. From-SVN: r36373 --- gcc/ChangeLog | 5 +++++ gcc/ifcvt.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1520949..19e9f54 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-09-12 Jim Wilson + + * ifcvt.c (noce_process_if_block): If A and B are the same, and no + else block, and X has side-effects, then fail. + 2000-09-12 Greg McGary * config/mips/mips-protos.h diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 901bd42..3ca0e6c 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1247,6 +1247,11 @@ noce_process_if_block (test_bb, then_bb, else_bb, join_bb) reorder_insns (insn_b, insn_b, PREV_INSN (if_info.cond_earliest)); insn_b = NULL_RTX; } + /* If we have "x = b; if (...) x = a;", and x has side-effects, then + x must be executed twice. */ + else if (insn_b && side_effects_p (orig_x)) + return FALSE; + x = orig_x; goto success; } -- 2.7.4