*** empty log message ***

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@1180 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/config/romp/romp.md b/gcc/config/romp/romp.md
index 7bad21b..e2e2c81 100644 (file)
--- a/gcc/config/romp/romp.md
+++ b/gcc/config/romp/romp.md
@@ -557,7 +557,10 @@
    && ! (GET_CODE (operands[0]) == REG
          && REGNO (operands[0]) >= FIRST_PSEUDO_REGISTER)
    && ! (GET_CODE (operands[1]) == REG
-         && REGNO (operands[1]) >= FIRST_PSEUDO_REGISTER)"
+         && REGNO (operands[1]) >= FIRST_PSEUDO_REGISTER)
+   && ! (GET_CODE (operands[0]) == REG && GET_CODE (operands[1]) == REG
+        && ! reload_completed
+        && reg_overlap_mentioned_p (operands[0], operands[1]))"
  [(parallel [(set (match_dup 2) (match_dup 3))
             (clobber (match_dup 7))])
   (parallel [(set (match_dup 4) (match_dup 5))
@@ -872,7 +875,10 @@
    && GET_CODE (operands[1]) != CONST_DOUBLE
    && (GET_CODE (operands[0]) != REG || REGNO (operands[0]) < 15)
    && (GET_CODE (operands[1]) != REG || REGNO (operands[1]) < 15)
-   && (GET_CODE (operands[0]) == REG || GET_CODE (operands[1]) == REG)"
+   && (GET_CODE (operands[0]) == REG || GET_CODE (operands[1]) == REG)
+   && ! (GET_CODE (operands[0]) == REG && GET_CODE (operands[1]) == REG
+        && ! reload_completed
+        && reg_overlap_mentioned_p (operands[0], operands[1]))"
   [(set (match_dup 2) (match_dup 3))
    (set (match_dup 4) (match_dup 5))]
   "

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 243f56d..a10f483 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1470,8 +1470,8 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
                  /* If we must not delete the source,
                     load it into a new temporary.  */
                  copy = emit_insn (copy_rtx_and_substitute (pattern, map));
-                 SET_DEST (pattern)
-                   = gen_reg_rtx (GET_MODE (SET_DEST (pattern)));
+                 SET_DEST (PATTERN (copy)) 
+                   = gen_reg_rtx (GET_MODE (SET_DEST (PATTERN (copy))));
                }
              else
                break;