diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-08 19:14:32 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-08 19:14:32 +0000 |
| commit | b02299a59568ff89673df8657d7828ba25d4577d (patch) | |
| tree | df0f29462dbc6428ed4962ed38ab1b9436b1dfb5 /gcc | |
| parent | 9d013742926d83ae73279970b4b8ad2fa8de0bc4 (diff) | |
| download | gcc-b02299a59568ff89673df8657d7828ba25d4577d.tar.gz | |
2000-10-07 Anthony Green <green@redhat.com>
* class.c (layout_class): Handle case where superclass can't be
layed out yet.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36789 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/class.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index c392f6ba398..a1ef24f1feb 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2000-10-07 Anthony Green <green@redhat.com> + + * class.c (layout_class): Handle case where superclass can't be + layed out yet. + 2000-10-07 Joseph S. Myers <jsm28@cam.ac.uk> * Makefile.in (keyword.h): Refer to GNU FTP site for updated @@ -152,7 +157,6 @@ Wed Sep 13 11:50:35 2000 Alexandre Petit-Bianco <apbianco@cygnus.com> (argument_types_convertible): Likewise. (patch_cast): Rename wfl_op parameter to avoid macro conflicts. ->>>>>>> 1.531 2000-09-14 Tom Tromey <tromey@cygnus.com> * lex.h: Use HAVE_ICONV_H, not HAVE_ICONV. diff --git a/gcc/java/class.c b/gcc/java/class.c index 3d4e5839ccb..b029da55538 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1839,8 +1839,10 @@ layout_class (this_class) if (super_class) { - super_class = maybe_layout_super_class (super_class, this_class); - if (TREE_CODE (TYPE_SIZE (super_class)) == ERROR_MARK) + tree maybe_super_class + = maybe_layout_super_class (super_class, this_class); + if (maybe_super_class == NULL + || TREE_CODE (TYPE_SIZE (maybe_super_class)) == ERROR_MARK) { TYPE_SIZE (this_class) = error_mark_node; CLASS_BEING_LAIDOUT (this_class) = 0; |