decl.c (finish_constructor_body): Don't set the return value of the constructor if...

2008-07-01  Andrew Haley  <aph@redhat.com>

        * decl.c (finish_constructor_body): Don't set the return value of
        the constructor if the constructor is that of a Java type.

From-SVN: r137317

gcc/cp/ChangeLog

+2008-07-01  Andrew Haley  <aph@redhat.com>
+
+	* decl.c (finish_constructor_body): Don't set the return value of
+	the constructor if the constructor is that of a Java type.
+
 2008-06-30  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/36662

gcc/cp/decl.c

@@ -11606,7 +11606,8 @@ finish_constructor_body (void)
   tree val;
   tree exprstmt;
 
-  if (targetm.cxx.cdtor_returns_this ())
+  if (targetm.cxx.cdtor_returns_this ()
+      && (! TYPE_FOR_JAVA (current_class_type)))
     {
       /* Any return from a constructor will end up here.  */
       add_stmt (build_stmt (LABEL_EXPR, cdtor_label));