From: Bryce McKinlay <bryce@mckinlay.net.nz>
Date: Wed, 17 Sep 2003 05:00:46 +0000 (+0000)
Subject: re PR java/12254 (Regression in java networking code)
X-Git-Tag: releases/gcc-3.4.0~3703
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=936346797b01c6f191bd904f1a6bdb36ab43317d;p=thirdparty%2Fgcc.git

re PR java/12254 (Regression in java networking code)

        * class.c (add_miranda_methods): Ensure super-interfaces are laid
        out. Fix for PR java/12254.

From-SVN: r71454
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 2991bd23c696..385cd852ee54 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-16  Bryce McKinlay  <bryce@mckinlay.net.nz>
+
+	* class.c (add_miranda_methods): Ensure super-interfaces are laid 
+	out. Fix for PR java/12254.
+
 2003-09-11  Richard Henderson  <rth@redhat.com>
 
         * parse.y (source_end_java_method): Update for new
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 620a8a2e6c96..a1c7249156b4 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1862,10 +1862,12 @@ add_miranda_methods (tree base_class, tree search_class)
 	break;
       elt = BINFO_TYPE (elt);
 
-      /* Note that order matters here.  However, all the base classes
-	 will have been laid out at this point, so the order will
-	 always be correct.  Also, this code must match similar layout
-	 code in the runtime.  */
+      /* Ensure that interface methods are seen in declared order.  */
+      layout_class_methods (elt);
+
+      /* All base classes will have been laid out at this point, so the order 
+         will be correct.  This code must match similar layout code in the 
+         runtime.  */
       for (method_decl = TYPE_METHODS (elt);
 	   method_decl; method_decl = TREE_CHAIN (method_decl))
 	{