(This trying to counter the effect of the PR 195 check in -- this should

 be right now.)

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

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index a01cb65..42d4699 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -9996,7 +9996,8 @@ java_complete_expand_methods (class_decl)
   for (decl = first_decl; decl; decl = TREE_CHAIN (decl))
     {
       /* Skip abstract or native methods */
-      if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl))
+      if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl)
+         || DECL_CONSTRUCTOR_P (decl) || DECL_CLINIT_P (decl))
        continue;
       java_complete_expand_method (decl);
     }

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index f56daab..427ba75 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -7298,7 +7298,8 @@ java_complete_expand_methods (class_decl)
   for (decl = first_decl; decl; decl = TREE_CHAIN (decl))
     {
       /* Skip abstract or native methods */
-      if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl))
+      if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl)
+         || DECL_CONSTRUCTOR_P (decl) || DECL_CLINIT_P (decl))
        continue;
       java_complete_expand_method (decl);
     }