OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alexandre Petit-Bianco 2000-09-07 18:24:41 +00:00 committed by Alexandre Petit-Bianco
parent 2496f0b583
commit 3e99f50c2b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/java/ChangeLog
View File

@ -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.

14
gcc/java/verify.c
View File

@ -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))