diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c58ff7533d3..995a7d4eaee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-27  Jason Merrill  <jason@redhat.com>
+
+	PR c++/31337
+	* gimplify.c (gimplify_modify_expr): Discard the assignment of 
+	zero-sized types after calling gimplify_modify_expr_rhs.
+
 2007-08-27  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* regclass.c (init_reg_autoinc): Fix typo.
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index cea79919965..aed8ab76949 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -3654,8 +3654,16 @@ gimplify_modify_expr (tree *expr_p, tree *pre_p, tree *post_p, bool want_value)
 	      || TREE_CODE (*expr_p) == GIMPLE_MODIFY_STMT
 	      || TREE_CODE (*expr_p) == INIT_EXPR);
 
-  /* For zero sized types only gimplify the left hand side and right hand side
-     as statements and throw away the assignment.  */
+  /* See if any simplifications can be done based on what the RHS is.  */
+  ret = gimplify_modify_expr_rhs (expr_p, from_p, to_p, pre_p, post_p,
+				  want_value);
+  if (ret != GS_UNHANDLED)
+    return ret;
+
+  /* For zero sized types only gimplify the left hand side and right hand
+     side as statements and throw away the assignment.  Do this after
+     gimplify_modify_expr_rhs so we handle TARGET_EXPRs of addressable
+     types properly.  */
   if (zero_sized_type (TREE_TYPE (*from_p)))
     {
       gimplify_stmt (from_p);
@@ -3666,12 +3674,6 @@ gimplify_modify_expr (tree *expr_p, tree *pre_p, tree *post_p, bool want_value)
       return GS_ALL_DONE;
     }
 
-  /* See if any simplifications can be done based on what the RHS is.  */
-  ret = gimplify_modify_expr_rhs (expr_p, from_p, to_p, pre_p, post_p,
-				  want_value);
-  if (ret != GS_UNHANDLED)
-    return ret;
-
   /* If the value being copied is of variable width, compute the length
      of the copy into a WITH_SIZE_EXPR.   Note that we need to do this
      before gimplifying any of the operands so that we can resolve any
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7dafb76b11a..3795be363da 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-27  Jason Merrill  <jason@redhat.com>
+
+	PR c++/31337
+	* g++.dg/ext/stmtexpr11.C: New.
+
 2007-08-27  Kazu Hirata  <kazu@codesourcery.com>
 
 	* lib/target-supports.exp (check_profiling_available):
diff --git a/gcc/testsuite/g++.dg/ext/stmtexpr11.C b/gcc/testsuite/g++.dg/ext/stmtexpr11.C
new file mode 100644
index 00000000000..8b5c5f84768
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/stmtexpr11.C
@@ -0,0 +1,15 @@
+// PR c++/31337
+// { dg-options "" }
+
+struct A
+{
+  int i[0];
+  A();
+  A(const A&);
+  ~A();
+};
+
+void foo()
+{
+  A a = ({ A(); });
+}