aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMichael Matz <matz@suse.de>2009-04-28 12:22:47 +0000
committerMichael Matz <matz@gcc.gnu.org>2009-04-28 12:22:47 +0000
commit1b15a008b64079a3751979fd63bb868610aa2514 (patch)
tree1a0b16f272f6f36b29b6bfc752b64eaf6ede66e0 /gcc
parent7569a6cc2a7a381ea23f17a2a705b7e5c39e9569 (diff)
downloadgcc-1b15a008b64079a3751979fd63bb868610aa2514.zip
gcc-1b15a008b64079a3751979fd63bb868610aa2514.tar.gz
gcc-1b15a008b64079a3751979fd63bb868610aa2514.tar.bz2
re PR middle-end/39922 (Revision 146817 caused many regressions on trunk)
PR middle-end/39922 * tree-outof-ssa.c (insert_value_copy_on_edge): Don't convert constants. From-SVN: r146889
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree-outof-ssa.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e971e53..00e0c6a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-28 Michael Matz <matz@suse.de>
+
+ PR middle-end/39922
+ * tree-outof-ssa.c (insert_value_copy_on_edge): Don't convert
+ constants.
+
2009-04-28 Richard Guenther <rguenther@suse.de>
* tree-vect-stmts.c (vect_get_vec_def_for_operand): Fix
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 4e7c787..41638d8 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -184,7 +184,7 @@ insert_value_copy_on_edge (edge e, int dest, tree src)
start_sequence ();
mode = GET_MODE (SA.partition_to_pseudo[dest]);
x = expand_expr (src, SA.partition_to_pseudo[dest], mode, EXPAND_NORMAL);
- if (GET_MODE (x) != mode)
+ if (GET_MODE (x) != VOIDmode && GET_MODE (x) != mode)
x = convert_to_mode (mode, x, TYPE_UNSIGNED (TREE_TYPE (src)));
if (x != SA.partition_to_pseudo[dest])
emit_move_insn (SA.partition_to_pseudo[dest], x);