diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03da741d5923..1f1c03159791 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-03  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/36326
+	* gimplify.c (is_gimple_mem_or_call_rhs): Remove work-around for
+	non-BLKmode types.
+
 2008-12-03  Tomas Bily  <tbily@suse.cz>
 
         PR middle-end/38250
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 20003137554b..09f130ecc7e5 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -656,13 +656,8 @@ static bool
 is_gimple_mem_or_call_rhs (tree t)
 {
   /* If we're dealing with a renamable type, either source or dest must be
-     a renamed variable.  Also force a temporary if the type doesn't need
-     to be stored in memory, since it's cheap and prevents erroneous
-     tailcalls (PR 17526).  */
-  if (is_gimple_reg_type (TREE_TYPE (t))
-      || (TYPE_MODE (TREE_TYPE (t)) != BLKmode
-	  && (TREE_CODE (t) != CALL_EXPR
-              || ! aggregate_value_p (t, t))))
+     a renamed variable.  */
+  if (is_gimple_reg_type (TREE_TYPE (t)))
     return is_gimple_val (t);
   else
     return is_gimple_formal_tmp_or_call_rhs (t);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f12dbdb41a34..c9364f8f94fd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/36326
+	* gcc.dg/tree-ssa/pr36326.c: New testcase.
+
 2008-12-03  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/37716
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c b/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c
new file mode 100644
index 000000000000..0611f7d8499b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-fdump-tree-gimple" } */
+
+union X { int i; double x; };
+
+int foo (union X *p)
+{
+  union X x = *p;
+  return x.x;
+}
+
+/* { dg-final { scan-tree-dump-not "x.0" "gimple" } } */
+/* { dg-final { cleanup-tree-dump "gimple" } } */