diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 47285866dc6..b759ba42580 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-17  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29039
+	* typeck2.c (build_functional_cast): Don't zero-initialize
+	non-PODs; instead, call their constructors.
+	* method.c (synthesize_method): Always build mem-initializers, if
+	we're synthesizing the default constructor.
+
 2006-10-17  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/27270
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index e2106fff55c..ded0af04716 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -784,7 +784,7 @@ synthesize_method (tree fndecl)
       tree arg_chain = FUNCTION_FIRST_USER_PARMTYPE (fndecl);
       if (arg_chain != void_list_node)
 	do_build_copy_constructor (fndecl);
-      else if (TYPE_NEEDS_CONSTRUCTING (current_class_type))
+      else
 	finish_mem_initializers (NULL_TREE);
     }
 
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 725c85fa597..12987cfab1e 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1333,9 +1333,9 @@ build_functional_cast (tree exp, tree parms)
   if (parms && TREE_CHAIN (parms) == NULL_TREE)
     return build_c_cast (type, TREE_VALUE (parms));
 
-  /* We need to zero-initialize POD types.  Let's do that for everything
-     that doesn't need a constructor.  */
-  if (parms == NULL_TREE && !TYPE_NEEDS_CONSTRUCTING (type)
+  /* We need to zero-initialize POD types.  */
+  if (parms == NULL_TREE 
+      && !CLASSTYPE_NON_POD_P (type)
       && TYPE_HAS_DEFAULT_CONSTRUCTOR (type))
     {
       exp = build_constructor (type, NULL);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4fed928d1ca..57ec350bd85 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29039
+	* g++.dg/init/ctor8.C: New test.
+	
 2006-10-17  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/27270
diff --git a/gcc/testsuite/g++.dg/init/ctor8.C b/gcc/testsuite/g++.dg/init/ctor8.C
new file mode 100644
index 00000000000..9723892f91c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/ctor8.C
@@ -0,0 +1,11 @@
+// PR c++/29039
+
+typedef struct S { // { dg-error "reference" }
+  int &r; 
+};
+
+S f () {
+  return S (); // { dg-error "synthesized" }
+}
+
+