* class.c (finish_struct_1): Do not warn about non-virtual

	destructors in Java classes.

	* g++.dg/warn/Wnvdtor.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96054 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4c40681..3048511 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-07  Mark Mitchell  <mark@codesourcery.com>
+
+       * class.c (finish_struct_1): Do not warn about non-virtual
+       destructors in Java classes.
+
 2005-03-05  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        PR c++/19311

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index ba89ea1..89346d6 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5029,7 +5029,9 @@ finish_struct_1 (tree t)
   /* Build the VTT for T.  */
   build_vtt (t);
 
-  if (warn_nonvdtor && TYPE_POLYMORPHIC_P (t))
+  /* This warning does not make sense for Java classes, since they
+     cannot have destructors.  */
+  if (!TYPE_FOR_JAVA (t) && warn_nonvdtor && TYPE_POLYMORPHIC_P (t))
     {
       tree dtor;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3b33042..452046f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07  Mark Mitchell  <mark@codesourcery.com>
+
+       * g++.dg/warn/Wnvdtor.C: New test.
+
 2005-03-07  Richard Sandiford  <rsandifo@redhat.com>
 
        * gcc.dg/torture/pr19683-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/warn/Wnvdtor.C b/gcc/testsuite/g++.dg/warn/Wnvdtor.C
new file mode 100644 (file)
index 0000000..b04fdcb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wnvdtor.C
@@ -0,0 +1,10 @@
+// { dg-options "-Wnon-virtual-dtor" }
+
+extern "Java"
+{
+  class Foo
+  {
+  public:
+    virtual void bar( void);
+  };
+}