diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c13028913b1..5679160c2d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -20,6 +20,9 @@
 	* config/ia64/ia64.md (cond_opsi2_internal and splitters): New
 	patterns.
 
+	* expr.c (expand_expr, case COND_EXPR): Prefer working with a
+	temporary register than directly using a MEM.
+
 2001-08-04  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* config/sh/sh.c (sh_asm_named_section): Fix typo in align
diff --git a/gcc/expr.c b/gcc/expr.c
index 80f73f854dc..de399698f64 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8211,8 +8211,8 @@ expand_expr (exp, target, tmode, modifier)
 		     || GET_CODE (original_target) == REG
 		     || TREE_ADDRESSABLE (type))
 #endif
-		 && ! (GET_CODE (original_target) == MEM
-		       && MEM_VOLATILE_P (original_target)))
+		 && (GET_CODE (original_target) != MEM
+		     || TREE_ADDRESSABLE (type)))
 	  temp = original_target;
 	else if (TREE_ADDRESSABLE (type))
 	  abort ();