X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fjava%2Fjava-gimplify.c;h=516b61cd28aded3b3dfe8dba4104ab52b6f31bfa;hb=7717ea00902734bd90371e34af23d0b73287f875;hp=ea1b3f0bd6545b8a6ece2e147d331d4aa08ae9fc;hpb=d471893dcbdfab38ec021b746517d648db7dbb42;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c index ea1b3f0bd65..516b61cd28a 100644 --- a/gcc/java/java-gimplify.c +++ b/gcc/java/java-gimplify.c @@ -1,11 +1,12 @@ /* Java(TM) language-specific gimplification routines. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006, 2007, 2007, 2008 + Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) +the Free Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, @@ -14,9 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +along with GCC; see the file COPYING3. If not see +. Java and all Java-based marks are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. @@ -25,19 +25,15 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" #include "tree.h" #include "java-tree.h" #include "tree-dump.h" -#include "tree-gimple.h" -#include "toplev.h" +#include "gimple.h" -static tree java_gimplify_case_expr (tree); -static tree java_gimplify_default_expr (tree); static tree java_gimplify_block (tree); -static tree java_gimplify_new_array_init (tree); -static tree java_gimplify_try_expr (tree); -static tree java_gimplify_modify_expr (tree); +static enum gimplify_status java_gimplify_modify_expr (tree *); +static enum gimplify_status java_gimplify_self_mod_expr (tree *, gimple_seq *, + gimple_seq *); static void dump_java_tree (enum tree_dump_index, tree); @@ -46,19 +42,14 @@ static void dump_java_tree (enum tree_dump_index, tree); void java_genericize (tree fndecl) { + walk_tree (&DECL_SAVED_TREE (fndecl), java_replace_references, NULL, NULL); dump_java_tree (TDI_original, fndecl); - - /* Genericize with the gimplifier. */ - gimplify_function_tree (fndecl); - - dump_function (TDI_generic, fndecl); } /* Gimplify a Java tree. */ int -java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED, - tree *post_p ATTRIBUTE_UNUSED) +java_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) { enum tree_code code = TREE_CODE (*expr_p); @@ -68,136 +59,63 @@ java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED, *expr_p = java_gimplify_block (*expr_p); break; - case EXPR_WITH_FILE_LOCATION: - input_location.file = EXPR_WFL_FILENAME (*expr_p); - input_location.line = EXPR_WFL_LINENO (*expr_p); - *expr_p = EXPR_WFL_NODE (*expr_p); - annotate_with_locus (*expr_p, input_location); - break; - - case CASE_EXPR: - *expr_p = java_gimplify_case_expr (*expr_p); - break; - - case DEFAULT_EXPR: - *expr_p = java_gimplify_default_expr (*expr_p); - break; - - case NEW_ARRAY_INIT: - *expr_p = java_gimplify_new_array_init (*expr_p); - break; - - case TRY_EXPR: - *expr_p = java_gimplify_try_expr (*expr_p); - break; - - case JAVA_CATCH_EXPR: - *expr_p = TREE_OPERAND (*expr_p, 0); - break; - - case JAVA_EXC_OBJ_EXPR: - *expr_p = build_exception_object_ref (TREE_TYPE (*expr_p)); - break; - - case VAR_DECL: - *expr_p = java_replace_reference (*expr_p, /* want_lvalue */ false); - return GS_UNHANDLED; - case MODIFY_EXPR: - *expr_p = java_gimplify_modify_expr (*expr_p); - return GS_UNHANDLED; - - case SAVE_EXPR: - if (TREE_CODE (TREE_OPERAND (*expr_p, 0)) == VAR_DECL) - TREE_OPERAND (*expr_p, 0) - = java_replace_reference (TREE_OPERAND (*expr_p, 0), - /* want_lvalue */ false); - return GS_UNHANDLED; - + return java_gimplify_modify_expr (expr_p); + + case POSTINCREMENT_EXPR: + case POSTDECREMENT_EXPR: + case PREINCREMENT_EXPR: + case PREDECREMENT_EXPR: + return java_gimplify_self_mod_expr (expr_p, pre_p, post_p); + /* These should already be lowered before we get here. */ case URSHIFT_EXPR: case COMPARE_EXPR: case COMPARE_L_EXPR: case COMPARE_G_EXPR: - case UNARY_PLUS_EXPR: - case NEW_ARRAY_EXPR: - case NEW_ANONYMOUS_ARRAY_EXPR: - case NEW_CLASS_EXPR: - case THIS_EXPR: - case SYNCHRONIZED_EXPR: - case CONDITIONAL_EXPR: - case INSTANCEOF_EXPR: - case CLASS_LITERAL: - abort (); + gcc_unreachable (); default: - /* Java insists on strict left-to-right evaluation of expressions. - A problem may arise if a variable used in the LHS of a binary - operation is altered by an assignment to that value in the RHS - before we've performed the operation. So, we always copy every - LHS to a temporary variable. - - FIXME: Are there any other cases where we should do this? - Parameter lists, maybe? Or perhaps that's unnecessary because - the front end already generates SAVE_EXPRs. */ - - if (TREE_CODE_CLASS (code) == '2' || TREE_CODE_CLASS (code) == '<') - { - enum gimplify_status stat - = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, post_p, - is_gimple_formal_tmp_var, fb_rvalue); - if (stat == GS_ERROR) - return stat; - } - return GS_UNHANDLED; } return GS_OK; } -/* This is specific to the bytecode compiler. If a variable has - LOCAL_SLOT_P set, replace an assignment to it with an assignment to - the corresponding variable that holds all its aliases. */ - -static tree -java_gimplify_modify_expr (tree modify_expr) +static enum gimplify_status +java_gimplify_modify_expr (tree *modify_expr_p) { + tree modify_expr = *modify_expr_p; tree lhs = TREE_OPERAND (modify_expr, 0); tree rhs = TREE_OPERAND (modify_expr, 1); tree lhs_type = TREE_TYPE (lhs); - - if (TREE_CODE (lhs) == VAR_DECL - && DECL_LANG_SPECIFIC (lhs) - && LOCAL_SLOT_P (lhs) - && TREE_CODE (lhs_type) == POINTER_TYPE) - { - tree new_lhs = java_replace_reference (lhs, /* want_lvalue */ true); - tree new_rhs = build1 (NOP_EXPR, TREE_TYPE (new_lhs), rhs); - modify_expr = build2 (MODIFY_EXPR, TREE_TYPE (new_lhs), - new_lhs, new_rhs); - modify_expr = build1 (NOP_EXPR, lhs_type, modify_expr); - } - - return modify_expr; -} - -static tree -java_gimplify_case_expr (tree expr) -{ - tree label = create_artificial_label (); - return build3 (CASE_LABEL_EXPR, void_type_node, - TREE_OPERAND (expr, 0), NULL_TREE, label); + if (lhs_type != TREE_TYPE (rhs)) + /* Fix up type mismatches to make legal GIMPLE. These are + generated in several places, in particular null pointer + assignment and subclass assignment. */ + TREE_OPERAND (modify_expr, 1) = convert (lhs_type, rhs); + + return GS_UNHANDLED; } -static tree -java_gimplify_default_expr (tree expr ATTRIBUTE_UNUSED) +/* Special case handling for volatiles: we need to generate a barrier + between the reading and the writing. */ + +static enum gimplify_status +java_gimplify_self_mod_expr (tree *expr_p, gimple_seq *pre_p ATTRIBUTE_UNUSED, + gimple_seq *post_p ATTRIBUTE_UNUSED) { - tree label = create_artificial_label (); - return build3 (CASE_LABEL_EXPR, void_type_node, NULL_TREE, NULL_TREE, label); + tree lhs = TREE_OPERAND (*expr_p, 0); + + if (TREE_CODE (lhs) == COMPONENT_REF + && TREE_THIS_VOLATILE (TREE_OPERAND (lhs, 1))) + TREE_THIS_VOLATILE (lhs) = 1; + + return GS_UNHANDLED; } + /* Gimplify BLOCK into a BIND_EXPR. */ static tree @@ -205,12 +123,12 @@ java_gimplify_block (tree java_block) { tree decls = BLOCK_VARS (java_block); tree body = BLOCK_EXPR_BODY (java_block); - tree outer = gimple_current_bind_expr (); + gimple outer = gimple_current_bind_expr (); tree block; /* Don't bother with empty blocks. */ if (! body) - return build_empty_stmt (); + return build_empty_stmt (input_location); if (IS_EMPTY_STMT (body)) return body; @@ -220,83 +138,20 @@ java_gimplify_block (tree java_block) block = make_node (BLOCK); BLOCK_VARS (block) = decls; - /* The TREE_USED flag on a block determines whether the debug ouput + /* The TREE_USED flag on a block determines whether the debug output routines generate info for the variables in that block. */ TREE_USED (block) = 1; - if (outer != NULL_TREE) + if (outer != NULL) { - outer = BIND_EXPR_BLOCK (outer); - BLOCK_SUBBLOCKS (outer) = chainon (BLOCK_SUBBLOCKS (outer), block); + tree b = gimple_bind_block (outer); + BLOCK_SUBBLOCKS (b) = chainon (BLOCK_SUBBLOCKS (b), block); } + BLOCK_EXPR_BODY (java_block) = NULL_TREE; return build3 (BIND_EXPR, TREE_TYPE (java_block), decls, body, block); } -/* Gimplify a NEW_ARRAY_INIT node into array/element assignments. */ - -static tree -java_gimplify_new_array_init (tree exp) -{ - tree array_type = TREE_TYPE (TREE_TYPE (exp)); - tree data_field = lookup_field (&array_type, get_identifier ("data")); - tree element_type = TYPE_ARRAY_ELEMENT (array_type); - HOST_WIDE_INT ilength = java_array_type_length (array_type); - tree length = build_int_cst (NULL_TREE, ilength, 0); - tree init = TREE_OPERAND (exp, 0); - tree values = CONSTRUCTOR_ELTS (init); - - tree array_ptr_type = build_pointer_type (array_type); - tree tmp = create_tmp_var (array_ptr_type, "array"); - tree body = build2 (MODIFY_EXPR, array_ptr_type, tmp, - build_new_array (element_type, length)); - - int index = 0; - - /* FIXME: try to allocate array statically? */ - while (values != NULL_TREE) - { - /* FIXME: Should use build_java_arrayaccess here, but avoid - bounds checking. */ - tree lhs = build3 (COMPONENT_REF, TREE_TYPE (data_field), - build_java_indirect_ref (array_type, tmp, 0), - data_field, NULL_TREE); - tree assignment = build2 (MODIFY_EXPR, element_type, - build4 (ARRAY_REF, element_type, lhs, - build_int_cst (NULL_TREE, index++, 0), - NULL_TREE, NULL_TREE), - TREE_VALUE (values)); - body = build2 (COMPOUND_EXPR, element_type, body, assignment); - values = TREE_CHAIN (values); - } - - return build2 (COMPOUND_EXPR, array_ptr_type, body, tmp); -} - -static tree -java_gimplify_try_expr (tree try_expr) -{ - tree body = TREE_OPERAND (try_expr, 0); - tree handler = TREE_OPERAND (try_expr, 1); - tree catch = NULL_TREE; - - /* Build a CATCH_EXPR for each handler. */ - while (handler) - { - tree java_catch = TREE_OPERAND (handler, 0); - tree catch_type = TREE_TYPE (TREE_TYPE (BLOCK_EXPR_DECLS (java_catch))); - tree expr = build2 (CATCH_EXPR, void_type_node, - prepare_eh_table_type (catch_type), - handler); - if (catch) - catch = build2 (COMPOUND_EXPR, void_type_node, catch, expr); - else - catch = expr; - handler = TREE_CHAIN (handler); - } - return build2 (TRY_CATCH_EXPR, void_type_node, body, catch); -} - /* Dump a tree of some kind. This is a convenience wrapper for the dump_* functions in tree-dump.c. */ static void