jcf-write.c (generate_byecode_insns): Fixed indentation for COMPOUND_EXPR and FIX_TRU...

Tue Nov 30 12:28:34 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * jcf-write.c (generate_byecode_insns): Fixed indentation for
        COMPOUND_EXPR and FIX_TRUNC_EXPR cases.

        * parse.y (patch_assignment): Removed bogus final class test on
        lhs when checking on whether to emit an ArrayStoreException runtime
        check.
        * expr.c (expand_java_arraystore): Likewise.

From-SVN: r30806

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3adaa4392b20361e1f1bdd6dfd3086c08660a97d..276dbd45947d7bb47f9a5dbee5f15e2d8e5eb189 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,13 @@
+Tue Nov 30 12:28:34 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+        * jcf-write.c (generate_byecode_insns): Fixed indentation for
+        COMPOUND_EXPR and FIX_TRUNC_EXPR cases.
+
+        * parse.y (patch_assignment): Removed bogus final class test on
+        lhs when checking on whether to emit an ArraySoreException runtime
+        check.
+        * expr.c (expand_java_arraystore): Likewise. 
+
 1999-11-24  Mark Mitchell  <mark@codesourcery.com>
 
        * except.c (emit_handlers): Zero catch_clauses after emitting them.

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 48d514644fb21472e77bb1ccaf434afc3cc651fe..1b1cad2eeafbcc653c35638265f296cdd7adf119 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -874,8 +874,7 @@ expand_java_arraystore (rhs_type_node)
   index = save_expr (index);
   array = save_expr (array);
 
-  if (TREE_CODE (rhs_type_node) == POINTER_TYPE
-      && !CLASS_FINAL (TYPE_NAME (TREE_TYPE (rhs_type_node))))
+  if (TREE_CODE (rhs_type_node) == POINTER_TYPE)
     {
       tree check = build (CALL_EXPR, void_type_node,
                          build_address_of (soft_checkarraystore_node),

diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 397a308cd290213d1432858783595f5f3768e4d3..a3710416ee697b787b8566af20818dc18799ce92 100644 (file)
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -1462,8 +1462,8 @@ generate_bytecode_insns (exp, target, state)
        }
       break;
       case COMPOUND_EXPR:      
-       generate_bytecode_insns (TREE_OPERAND (exp, 0), IGNORE_TARGET, state);
-       generate_bytecode_insns (TREE_OPERAND (exp, 1), target, state);
+      generate_bytecode_insns (TREE_OPERAND (exp, 0), IGNORE_TARGET, state);
+      generate_bytecode_insns (TREE_OPERAND (exp, 1), target, state);
       break;
     case EXPR_WITH_FILE_LOCATION:
       {
@@ -2140,7 +2140,8 @@ generate_bytecode_insns (exp, target, state)
          {
            if (TREE_CODE (exp) == CONVERT_EXPR)
              {
-               int index = find_class_constant (&state->cpool, TREE_TYPE (dst_type));
+               int index = find_class_constant (&state->cpool, 
+                                                TREE_TYPE (dst_type));
                RESERVE (3);
                OP1 (OPCODE_checkcast);
                OP2 (index);

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 07e6cfa72012c80644080c34458c959480079506..65a3f0935580b6ba9fe343838ec7e6229eb2c029 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -9193,8 +9193,7 @@ patch_assignment (node, wfl_op1, wfl_op2)
   if (!flag_emit_class_files
       && !flag_emit_xref
       && lvalue_from_array 
-      && JREFERENCE_TYPE_P (TYPE_ARRAY_ELEMENT (lhs_type))
-      && !CLASS_FINAL (TYPE_NAME (GET_SKIP_TYPE (rhs_type))))
+      && JREFERENCE_TYPE_P (TYPE_ARRAY_ELEMENT (lhs_type)))
     {
       tree check;
       tree base = lvalue;