aboutsummaryrefslogtreecommitdiff
path: root/gcc/cselib.c
diff options
context:
space:
mode:
authorRichard Sandiford <rdsandiford@googlemail.com>2009-10-22 22:30:12 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2009-10-22 22:30:12 +0000
commitbd7960b1e4ce9d64b2631d0b644eb8bf83845005 (patch)
tree4f4554809ba030c1b41d267109a8f8706fa58231 /gcc/cselib.c
parent2a31793e324e29c237dc9e46064280aa626374ad (diff)
downloadgcc-bd7960b1e4ce9d64b2631d0b644eb8bf83845005.zip
gcc-bd7960b1e4ce9d64b2631d0b644eb8bf83845005.tar.gz
gcc-bd7960b1e4ce9d64b2631d0b644eb8bf83845005.tar.bz2
rtl.h (shallow_copy_rtvec): Declare.
gcc/ * rtl.h (shallow_copy_rtvec): Declare. * rtl.c (shallow_copy_rtvec): New function. * cselib.c (cselib_subst_to_values): Use it. Only modify an rtx field if the subrtx has changed. From-SVN: r153475
Diffstat (limited to 'gcc/cselib.c')
-rw-r--r--gcc/cselib.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/gcc/cselib.c b/gcc/cselib.c
index aa5f7b0..7065429 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -1422,30 +1422,31 @@ cselib_subst_to_values (rtx x)
{
rtx t = cselib_subst_to_values (XEXP (x, i));
- if (t != XEXP (x, i) && x == copy)
- copy = shallow_copy_rtx (x);
-
- XEXP (copy, i) = t;
+ if (t != XEXP (x, i))
+ {
+ if (x == copy)
+ copy = shallow_copy_rtx (x);
+ XEXP (copy, i) = t;
+ }
}
else if (fmt[i] == 'E')
{
- int j, k;
+ int j;
for (j = 0; j < XVECLEN (x, i); j++)
{
rtx t = cselib_subst_to_values (XVECEXP (x, i, j));
- if (t != XVECEXP (x, i, j) && XVEC (x, i) == XVEC (copy, i))
+ if (t != XVECEXP (x, i, j))
{
- if (x == copy)
- copy = shallow_copy_rtx (x);
-
- XVEC (copy, i) = rtvec_alloc (XVECLEN (x, i));
- for (k = 0; k < j; k++)
- XVECEXP (copy, i, k) = XVECEXP (x, i, k);
+ if (XVEC (x, i) == XVEC (copy, i))
+ {
+ if (x == copy)
+ copy = shallow_copy_rtx (x);
+ XVEC (copy, i) = shallow_copy_rtvec (XVEC (x, i));
+ }
+ XVECEXP (copy, i, j) = t;
}
-
- XVECEXP (copy, i, j) = t;
}
}
}