integrate.c (copy_rtx_and_substitute): Rework to avoid need for unused "junk" variable.

        * integrate.c (copy_rtx_and_substitute): Rework to avoid need for
        unused "junk" variable.

From-SVN: r18878

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d6844e1ca4241fecf983ed373d4d8fbc8743801f..9b12080bd42c15afd0eb329f36c22e728d4c5d66 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Sat Mar 28 14:37:20 1998  Jeffrey A Law  (law@cygnus.com)
 
+       * integrate.c (copy_rtx_and_substitute): Rework to avoid need for
+       unused "junk" variable.
+
        * genattrtab.c (write_complex_function): Add a default case in
        generated switch statement to keep -W -Wall quiet.
 

diff --git a/gcc/integrate.c b/gcc/integrate.c
index e6258b33b05bf4454aa5245d9020be37dfca4a61..cde8b6f3e7d61d3ecdc9f0c1abfb09c6fade619e 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -2606,12 +2606,15 @@ copy_rtx_and_substitute (orig, map)
          || SET_DEST (orig) == virtual_incoming_args_rtx)
        {
          /* In case a translation hasn't occurred already, make one now. */
-         rtx junk = copy_rtx_and_substitute (SET_DEST (orig), map);
-         rtx equiv_reg = map->reg_map[REGNO (SET_DEST (orig))];
-         rtx equiv_loc = map->const_equiv_map[REGNO (equiv_reg)];
-         HOST_WIDE_INT loc_offset
+         rtx equiv_reg;
+         rtx equiv_loc;
+         HOST_WIDE_INT loc_offset;
+
+         copy_rtx_and_substitute (SET_DEST (orig), map);
+         equiv_reg = map->reg_map[REGNO (SET_DEST (orig))];
+         equiv_loc = map->const_equiv_map[REGNO (equiv_reg)];
+         loc_offset
            = GET_CODE (equiv_loc) == REG ? 0 : INTVAL (XEXP (equiv_loc, 1));
-             
          return gen_rtx_SET (VOIDmode, SET_DEST (orig),
                              force_operand
                              (plus_constant