expr.c (pop_type_0): Only return object_ptr_type_node on mismatch if expeting an...

	* 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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d931457ec0d1961afb1c22d8fa47469413119170..b1295c18e751b8cdf22893db2d3e479ab64b5817 100644 (file)
--- 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 8b5eab752a03af7b02a12309830bbd04b55cb8e7..8dadacb35a4917ea0456e2584c2dc3d0e3ca8247 100644 (file)
--- 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 '";