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

+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.

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 '";