From b57300bcff75e7dcef532bd9ddce1c8171440a0f Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Sun, 21 Jan 2001 11:08:10 -0800 Subject: [PATCH] expr.c (pop_type_0): Only return object_ptr_type_node on mismatch if expeting an interface type. * 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. From-SVN: r39168 --- gcc/java/ChangeLog | 5 +++++ 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 + + * 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 * 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 '"; -- 2.30.2