expr.c (build_instanceof): Check for arrays when trying fold to false.

2001-02-15  Alexandre Petit-Bianco  <apbianco@redhat.com>

	* expr.c (build_instanceof): Check for arrays when trying fold to
	false.

(http://gcc.gnu.org/ml/gcc-patches/2001-02/msg00993.html)

From-SVN: r39778

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 92a48cdcaf1e3dbced813453451582242f7ae3a0..848fd7ce197212b3c440fa19887db6fdfc5c2d81 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-15  Alexandre Petit-Bianco  <apbianco@redhat.com>
+
+       * expr.c (build_instanceof): Check for arrays when trying fold to
+       false.
+
 2001-02-15  Jim Meyering  <meyering@lucent.com>
 
        * Make-lang.in (java.install-common): Depend on `installdirs'.
@@ -10,12 +15,12 @@
 2001-02-14  Tom Tromey  <tromey@redhat.com>
             Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
-        Fix for PR java/1261.
-        * typeck.c (build_java_array_type): Add public `clone' method to
-        arrays.
-        * parse.y (resolve_qualified_expression_name): Use current_class
+       Fix for PR java/1261.
+       * typeck.c (build_java_array_type): Add public `clone' method to
+       arrays.
+       * parse.y (resolve_qualified_expression_name): Use current_class
        when checking for inaccessibility.
-        (patch_method_invocation): Fixed error message when accessibility
+       (patch_method_invocation): Fixed error message when accessibility
        denied.  Added `from_super' argument.
 
 2001-02-14  Alexandre Petit-Bianco  <apbianco@redhat.com>

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 70a2fe9127639fbac2f5ed9729b6030647e44e6a..4f7c0dc6a861281ea3e62b63150543bde05f3a84 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1157,7 +1157,9 @@ build_instanceof (value, type)
                    value,
                    boolean_true_node, boolean_false_node);
     }
-  else if (DECL_P (klass) && DECL_P (valclass)
+  else if (! TYPE_ARRAY_P (type)
+          && ! TYPE_ARRAY_P (valtype)
+          && DECL_P (klass) && DECL_P (valclass)
           && ! CLASS_INTERFACE (valclass)
           && ! CLASS_INTERFACE (klass)
           && ! inherits_from_p (type, valtype)