diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-21 19:08:10 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-21 19:08:10 +0000 |
| commit | ddfb919a5c45165f5da5ea9f6271375042d258f5 (patch) | |
| tree | e6c6e69f70cb0cd8dbfd3d446ba4521864edebbe /gcc | |
| parent | b521bd38bbda1e0bd575779b1cc961e8168bc64e (diff) | |
| download | ppe42-gcc-ddfb919a5c45165f5da5ea9f6271375042d258f5.tar.gz ppe42-gcc-ddfb919a5c45165f5da5ea9f6271375042d258f5.zip | |
* expr.c (pop_type_0): Only return object_ptr_type_node on mismatch
if expeting an interface type. Refines Tom's change of 2000-09-12.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39168 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/expr.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index d931457ec0d..b1295c18e75 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-01-19 Per Bothner <per@bothner.com> + + * expr.c (pop_type_0): Only return object_ptr_type_node on mismatch + if expeting an interface type. Refines Tom's change of 2000-09-12. + 2001-01-18 Per Bothner <per@bothner.com> * gcj.texi (Input Options): Mention .java files. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 8b5eab752a0..8dadacb35a4 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -352,8 +352,8 @@ pop_type_0 (type, messagep) /* 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. */ - /* FIXME: this is worse than a kludge, probably. */ - return object_ptr_type_node; + else if (CLASS_INTERFACE (TYPE_NAME (TREE_TYPE (type)))) + return object_ptr_type_node; } { const char *str1 = "expected type '"; |
