expr.c (expand_expr, [...]): Get the mode from the tree for op1, not the rtl.

	* expr.c (expand_expr, case PLUS_EXPR): Get the mode from the
	tree for op1, not the rtl.

From-SVN: r28292

gcc/ChangeLog

+Tue Jul 27 03:15:33 1999  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* expr.c (expand_expr, case PLUS_EXPR): Get the mode from the 
+	tree for op1, not the rtl.
+
 Tue Jul 27 00:18:34 1999  Richard Henderson  <rth@cygnus.com>
 
 	* m88k.c (m88k_builtin_saveregs): Break out the constructor code

gcc/expr.c

@@ -4018,7 +4018,9 @@ store_constructor (exp, target, cleared)
      int cleared;
 {
   tree type = TREE_TYPE (exp);
+#ifdef WORD_REGISTER_OPERATIONS
   rtx exp_size = expr_size (exp);
+#endif
 
   /* We know our target cannot conflict, since safe_from_p has been called.  */
 #if 0
@@ -6955,7 +6957,7 @@ expand_expr (exp, target, tmode, modifier)
 	      constant_part
 		= immed_double_const (TREE_INT_CST_LOW (TREE_OPERAND (exp, 0)),
 				      (HOST_WIDE_INT) 0,
-				      GET_MODE (op1));
+				      TYPE_MODE (TREE_TYPE (TREE_OPERAND (exp, 1))));
 	      op1 = plus_constant (op1, INTVAL (constant_part));
 	      if (modifier != EXPAND_SUM && modifier != EXPAND_INITIALIZER)
 		op1 = force_operand (op1, target);