From: Jim Wilson <wilson@cygnus.com>
Date: Tue, 22 Jun 1999 14:39:07 +0000 (+0000)
Subject: Fix for abort when PROMOTE_MODES defined but PROMOTE_FUNCTION_{ARG,RETURN} not.
X-Git-Tag: releases/libgcj-2.95.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dbecef9bc52c4e9437c7bae83199c78ad90ae2c;p=thirdparty%2Fgcc.git

Fix for abort when PROMOTE_MODES defined but PROMOTE_FUNCTION_{ARG,RETURN} not.

	* expr.c (store_expr): When target is a promoted subreg, return a
	promoted subreg as a result.

From-SVN: r27705
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a2612882138..b83b411a8d3c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-22  Jim Wilson  <wilson@cygnus.com>
+
+	* expr.c (store_expr): When target is a promoted subreg, return a
+	promoted subreg as a result.
+
 Tue Jun 22 17:14:58 1999  Michael Meissner  <meissner@cygnus.com>
 
 	* dwarf2out.c (dwarf2out_frame_debug_expr): Reformat to match GNU
diff --git a/gcc/expr.c b/gcc/expr.c
index e5ef6e1ec880..dc9bca518ea0 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -3652,6 +3652,20 @@ store_expr (exp, target, want_value)
 
       convert_move (SUBREG_REG (target), temp,
 		    SUBREG_PROMOTED_UNSIGNED_P (target));
+
+      /* If we promoted a constant, change the mode back down to match
+	 target.  Otherwise, the caller might get confused by a result whose
+	 mode is larger than expected.  */
+
+      if (want_value && GET_MODE (temp) != GET_MODE (target)
+	  && GET_MODE (temp) != VOIDmode)
+	{
+	  temp = gen_rtx_SUBREG (GET_MODE (target), temp, 0);
+	  SUBREG_PROMOTED_VAR_P (temp) = 1;
+	  SUBREG_PROMOTED_UNSIGNED_P (temp)
+	    = SUBREG_PROMOTED_UNSIGNED_P (target);
+	}
+
       return want_value ? temp : NULL_RTX;
     }
   else