From: Alexandre Petit-Bianco <apbianco@cygnus.com>
Date: Thu, 7 Sep 2000 18:24:41 +0000 (+0000)
Subject: verify.c (merge_types): Load the types to merge if necessary.
X-Git-Tag: prereleases/libstdc++-2.92~4184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e99f50c2be1e2570b805f70ef54c9d0c711dea9;p=thirdparty%2Fgcc.git

verify.c (merge_types): Load the types to merge if necessary.

2000-09-05  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* verify.c (merge_types): Load the types to merge if necessary.

(http://gcc.gnu.org/ml/gcc-patches/2000-09/msg00245.html)

From-SVN: r36243
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 425f80115487..d8f85fca0caf 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -2,6 +2,10 @@
 
 	* lang-specs.h: Also recognize `-femit-class-files'.
 
+2000-09-05  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* verify.c (merge_types): Load the types to merge if necessary.
+
 2000-09-02  Anthony Green  <green@redhat.com>
 
 	* jcf-io.c: Include zlib.h.
diff --git a/gcc/java/verify.c b/gcc/java/verify.c
index 4c2e4c8b1d3a..fcaf7f37af5e 100644
--- a/gcc/java/verify.c
+++ b/gcc/java/verify.c
@@ -131,6 +131,20 @@ merge_types (type1, type2)
       tt1 = HANDLE_TO_CLASS_TYPE (TREE_TYPE (type1));
       tt2 = HANDLE_TO_CLASS_TYPE (TREE_TYPE (type2));
 
+      /* If tt{1,2} haven't been properly loaded, now is a good time
+         to do it. */
+      if (!TYPE_SIZE (tt1))
+	{
+	  load_class (tt1, 1);
+	  safe_layout_class (tt1);
+	}
+
+      if (!TYPE_SIZE (tt2))
+	{
+	  load_class (tt2, 1);
+	  safe_layout_class (tt2);
+	}
+
       if (TYPE_ARRAY_P (tt1) || TYPE_ARRAY_P (tt2))
 	{
 	  if (TYPE_ARRAY_P (tt1) == TYPE_ARRAY_P (tt2))