diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-12-18 21:15:52 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-12-18 21:15:52 +0000 |
| commit | c1eacb709f2f0ea4ad783e146ac95e21111022fd (patch) | |
| tree | 995e46d2de69324ffdd071c2072fcc0de72d8af7 /gcc/java/parse.y | |
| parent | 25cfec087a0d4de0736e71f729c0a2befec92132 (diff) | |
| download | gcc-c1eacb709f2f0ea4ad783e146ac95e21111022fd.zip gcc-c1eacb709f2f0ea4ad783e146ac95e21111022fd.tar.gz gcc-c1eacb709f2f0ea4ad783e146ac95e21111022fd.tar.bz2 | |
Fix for PRs gcj/312 and gcj/253:
* parse.y (valid_ref_assignconv_cast_p): Load classes for source and
dest if they arn't already.
* class.c (layout_class): Call maybe_layout_super_class on
superinterfaces also, but only if compiling from bytecode.
From-SVN: r38363
Diffstat (limited to 'gcc/java/parse.y')
| -rw-r--r-- | gcc/java/parse.y | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 7a23e72..ec09a49 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -12778,6 +12778,20 @@ valid_ref_assignconv_cast_p (source, dest, cast) source = TREE_TYPE (source); if (TREE_CODE (dest) == POINTER_TYPE) dest = TREE_TYPE (dest); + + /* If source and dest are being compiled from bytecode, they may need to + be loaded. */ + if (CLASS_P (source) && !CLASS_LOADED_P (source)) + { + load_class (source, 1); + safe_layout_class (source); + } + if (CLASS_P (dest) && !CLASS_LOADED_P (dest)) + { + load_class (dest, 1); + safe_layout_class (dest); + } + /* Case where SOURCE is a class type */ if (TYPE_CLASS_P (source)) { |