From: Per Bothner <per@bothner.com>
Date: Sun, 21 Jan 2001 19:08:10 +0000 (-0800)
Subject: expr.c (pop_type_0): Only return object_ptr_type_node on mismatch if expeting an... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b57300bcff75e7dcef532bd9ddce1c8171440a0f;p=gcc.git

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

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