diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-09-12 22:31:00 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-09-12 22:31:00 +0000 |
| commit | 86e4b1e4fad12aa60440cca590a75829ed3bb0d4 (patch) | |
| tree | 0ccf531ed65f15f9d846b6711665f7675fd947d2 /gcc/java/expr.c | |
| parent | d19cbcb5e3dd83e2628d25d2cd23892a4cac83b0 (diff) | |
| download | gcc-86e4b1e4fad12aa60440cca590a75829ed3bb0d4.zip gcc-86e4b1e4fad12aa60440cca590a75829ed3bb0d4.tar.gz gcc-86e4b1e4fad12aa60440cca590a75829ed3bb0d4.tar.bz2 | |
expr.c (pop_type_0): Return `Object' if trying to merge two interface types.
* expr.c (pop_type_0): Return `Object' if trying to merge two
interface types.
* verify.c (merge_types): Don't return `TYPE_UNKNOWN' for
interface types; `Object' is always a valid supertype.
From-SVN: r36378
Diffstat (limited to 'gcc/java/expr.c')
| -rw-r--r-- | gcc/java/expr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c index ebba1ac..fbc08c6 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -320,9 +320,8 @@ pop_type_0 (type) /* This is a kludge, but matches what Sun's verifier does. It can be tricked, but is safe as long as type errors (i.e. interface method calls) are caught at run-time. */ - else if (CLASS_INTERFACE (TYPE_NAME (TREE_TYPE (type))) - && t == object_ptr_type_node) - return t; + /* FIXME: this is worse than a kludge, probably. */ + return object_ptr_type_node; } return NULL_TREE; } |