gcc-pr21173.patch

   1 ===================================================================
   2 RCS file: /cvs/gcc/gcc/gcc/tree-ssa-pre.c,v
   3 retrieving revision 2.65.4.2
   4 retrieving revision 2.65.4.3
   5 diff -u -r2.65.4.2 -r2.65.4.3
   6 --- gcc/gcc/tree-ssa-pre.c      2005/04/17 23:40:31     2.65.4.2
   7 +++ gcc/gcc/tree-ssa-pre.c      2005/04/25 14:02:31     2.65.4.3
   8 @@ -1330,7 +1330,8 @@
   9
  10         folded = fold (build (TREE_CODE (expr), TREE_TYPE (expr),
  11                               genop1, genop2));
  12 -       newexpr = force_gimple_operand (folded, &forced_stmts, false, NULL);
  13 +       newexpr = force_gimple_operand (unshare_expr (folded),
  14 +                                       &forced_stmts, false, NULL);
  15         if (forced_stmts)
  16           {
  17             tsi = tsi_start (forced_stmts);
  18 @@ -1372,14 +1373,8 @@
  19         add_referenced_tmp_var (temp);
  20         folded = fold (build (TREE_CODE (expr), TREE_TYPE (expr),
  21                               genop1));
  22 -       /* If the generated operand  is already GIMPLE min_invariant
  23 -          just use it instead of calling force_gimple_operand on it,
  24 -          since that may make it not invariant by copying it into an
  25 -          assignment.  */
  26 -       if (!is_gimple_min_invariant (genop1))
  27 -         newexpr = force_gimple_operand (folded, &forced_stmts, false, NULL);
  28 -       else
  29 -         newexpr = genop1;
  30 +       newexpr = force_gimple_operand (unshare_expr (folded),
  31 +                                       &forced_stmts, false, NULL);
  32         if (forced_stmts)
  33           {
  34             tsi = tsi_start (forced_stmts);