From: Tom Tromey <tromey@cygnus.com>
Date: Sun, 25 Jun 2000 17:28:35 +0000 (+0000)
Subject: parse.y (check_abstract_method_definitions): Also check if `other_method' is abstract.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=120f0c104ac56e8b6dcbe2b29dd6940e6fb0e7a2;p=gcc.git

parse.y (check_abstract_method_definitions): Also check if `other_method' is abstract.

	* parse.y (check_abstract_method_definitions): Also check if
	`other_method' is abstract.

From-SVN: r34697
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5b0e1a65aab..10d0a73ea40 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-24  Tom Tromey  <tromey@cygnus.com>
+
+	* parse.y (check_abstract_method_definitions): Also check if
+	`other_method' is abstract.
+
 2000-06-23  Tom Tromey  <tromey@cygnus.com>
 
 	* parse.y (patch_incomplete_class_ref): Initialize the returned
diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index d6ece50a3dc..c28407e79c5 100644
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -8540,7 +8540,9 @@ check_abstract_method_definitions (do_interface, class_decl, type)
 	      other_name = EXPR_WFL_NODE (other_name);
 	    if (!DECL_CLINIT_P (other_method)
 		&& !DECL_CONSTRUCTOR_P (other_method)
-		&& method_name == other_name && method_sig == s)
+		&& method_name == other_name
+		&& method_sig == s
+		&& !METHOD_ABSTRACT (other_method))
              {
                found = 1;
                break;
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 3e0f83ea564..a24c3a016ea 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -5842,7 +5842,9 @@ check_abstract_method_definitions (do_interface, class_decl, type)
 	      other_name = EXPR_WFL_NODE (other_name);
 	    if (!DECL_CLINIT_P (other_method)
 		&& !DECL_CONSTRUCTOR_P (other_method)
-		&& method_name == other_name && method_sig == s)
+		&& method_name == other_name
+		&& method_sig == s
+		&& !METHOD_ABSTRACT (other_method))
              {
                found = 1;
                break;