re GNATS gcj/195: (gcj fail on code to implement an inner interface.)

(This trying to counter the effect of the PR 195 check in -- this should
 be right now.)

From-SVN: r33602

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index a01cb65f11892c33717776c2124fbbd3771b70ec..42d46998521ae8eb34872a3a9bdc0217333fa7e6 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 f56daab8a952b48b55ffee91c1c893ba36d79406..427ba7544a2335f20f6eedfe6323753450d7d6a0 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);
     }