From eead060a9971f96ae3dd21fc199f29f542b2e299 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Wed, 21 Dec 2005 16:52:13 +0000 Subject: [PATCH] re PR middle-end/25121 (libgcj misscompilation?) 2005-12-21 Andrew Haley PR middle-end/25121 * recog.c (peephole2_optimize): Don't peephole any RTX_FRAME_RELATED_P insns. From-SVN: r108914 --- gcc/ChangeLog | 6 ++++++ gcc/recog.c | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 69ca302d635..7c04dfb7a2e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-12-21 Andrew Haley + + PR middle-end/25121 + * recog.c (peephole2_optimize): Don't peephole any + RTX_FRAME_RELATED_P insns. + 2005-12-21 Kazu Hirata * tree-data-ref.c (estimate_niter_from_size_of_data): Replace diff --git a/gcc/recog.c b/gcc/recog.c index 1df4b7fd1de..8a3fe3506d2 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -3104,8 +3104,18 @@ peephole2_optimize (FILE *dump_file ATTRIBUTE_UNUSED) propagate_one_insn (pbi, insn); COPY_REG_SET (peep2_insn_data[peep2_current].live_before, live); - /* Match the peephole. */ - try = peephole2_insns (PATTERN (insn), insn, &match_len); + if (RTX_FRAME_RELATED_P (insn)) + { + /* If an insn has RTX_FRAME_RELATED_P set, peephole + substitution would lose the + REG_FRAME_RELATED_EXPR that is attached. */ + peep2_current_count = 0; + try = NULL; + } + else + /* Match the peephole. */ + try = peephole2_insns (PATTERN (insn), insn, &match_len); + if (try != NULL) { /* If we are splitting a CALL_INSN, look for the CALL_INSN -- 2.30.2