X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fjava%2Flang.c;h=39277accff105246e23c08748c81326a8b6b9ba7;hb=61a98835eb32cb811714c00067d54d8fea078106;hp=fadd972c1c9af88df081abbb2a308bccabee78e9;hpb=8531f242aa7ca71d1aa333f56c747f5b106781e1;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/java/lang.c b/gcc/java/lang.c index fadd972c1c9..39277accff1 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -1,23 +1,23 @@ /* Java(TM) language-specific utility routines. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify +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) any later version. -GNU CC is distributed in the hope that it will be useful, +GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 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 GNU CC; see the file COPYING. If not, write to +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. +Boston, MA 02111-1307, USA. Java and all Java-based marks are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. @@ -27,6 +27,8 @@ 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 "input.h" #include "rtl.h" @@ -41,35 +43,30 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "ggc.h" #include "diagnostic.h" #include "tree-inline.h" - -struct string_option -{ - const char *const string; - int *const variable; - const int on_value; -}; - -static const char *java_init PARAMS ((const char *)); -static void java_finish PARAMS ((void)); -static void java_init_options PARAMS ((void)); -static bool java_post_options PARAMS ((void)); - -static int java_decode_option PARAMS ((int, char **)); -static void put_decl_string PARAMS ((const char *, int)); -static void put_decl_node PARAMS ((tree)); -static void java_print_error_function PARAMS ((diagnostic_context *, - const char *)); -static int process_option_with_no PARAMS ((const char *, - const struct string_option *, - int)); -static tree java_tree_inlining_walk_subtrees PARAMS ((tree *, - int *, - walk_tree_fn, - void *, - void *)); -static int java_unsafe_for_reeval PARAMS ((tree)); -static bool java_can_use_bit_fields_p PARAMS ((void)); - +#include "splay-tree.h" +#include "tree-dump.h" +#include "opts.h" +#include "options.h" + +static bool java_init (void); +static void java_finish (void); +static unsigned int java_init_options (unsigned int, const char **); +static bool java_post_options (const char **); + +static int java_handle_option (size_t scode, const char *arg, int value); +static void put_decl_string (const char *, int); +static void put_decl_node (tree); +static void java_print_error_function (diagnostic_context *, const char *); +static tree java_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn, + void *, struct pointer_set_t *); +static int merge_init_test_initialization (void * *, void *); +static int inline_init_test_initialization (void * *, void *); +static bool java_can_use_bit_fields_p (void); +static bool java_dump_tree (void *, tree); +static void dump_compound_expr (dump_info_p, tree); +static bool java_decl_ok_for_sibcall (tree); +static tree java_get_callee_fndecl (tree); +static void java_clear_binding_stack (void); #ifndef TARGET_OBJECT_SUFFIX # define TARGET_OBJECT_SUFFIX ".o" @@ -81,9 +78,9 @@ static bool java_can_use_bit_fields_p PARAMS ((void)); #define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, -const char tree_code_type[] = { +const enum tree_code_class tree_code_type[] = { #include "tree.def" - 'x', + tcc_exceptional, #include "java-tree.def" }; #undef DEFTREECODE @@ -118,104 +115,26 @@ static bool inhibit_error_function_printing; int compiling_from_source; -char * resource_name; - -int flag_emit_class_files = 0; +const char *resource_name; -/* Nonzero if input file is a file with a list of filenames to compile. */ - -int flag_filelist_file = 0; - -/* When non zero, we emit xref strings. Values of the flag for xref +/* When nonzero, we emit xref strings. Values of the flag for xref backends are defined in xref_flag_table, xref.c. */ int flag_emit_xref = 0; -/* When non zero, -Wall was turned on. */ +/* When nonzero, -Wall was turned on. */ int flag_wall = 0; -/* When non zero, check for redundant modifier uses. */ -int flag_redundant = 0; - -/* When non zero, call a library routine to do integer divisions. */ -int flag_use_divide_subroutine = 1; - -/* When non zero, generate code for the Boehm GC. */ -int flag_use_boehm_gc = 0; - -/* When non zero, assume the runtime uses a hash table to map an - object to its synchronization structure. */ -int flag_hash_synchronization; - -/* When non zero, assume all native functions are implemented with - JNI, not CNI. */ -int flag_jni = 0; - -/* When non zero, warn when source file is newer than matching class - file. */ -int flag_newer = 1; - -/* When non zero, generate checks for references to NULL. */ -int flag_check_references = 0; - /* The encoding of the source file. */ const char *current_encoding = NULL; -/* When non zero, report the now deprecated empty statements. */ -int flag_extraneous_semicolon; - -/* When non zero, always check for a non gcj generated classes archive. */ -int flag_force_classes_archive_check; - -/* When zero, don't optimize static class initialization. This flag shouldn't - be tested alone, use STATIC_CLASS_INITIALIZATION_OPTIMIZATION_P instead. */ -int flag_optimize_sci = 1; - -/* When non zero, use offset tables for virtual method calls - in order to improve binary compatibility. */ -int flag_indirect_dispatch = 0; +/* When nonzero, print extra version information. */ +static int v_flag = 0; -/* When zero, don't generate runtime array store checks. */ -int flag_store_check = 1; - -/* When non zero, print extra version information. */ -static int version_flag = 0; - -/* Set non-zero if the user specified -finline-functions on the command +/* Set nonzero if the user specified -finline-functions on the command line. */ int flag_really_inline = 0; -/* Table of language-dependent -f options. - STRING is the option name. VARIABLE is the address of the variable. - ON_VALUE is the value to store in VARIABLE - if `-fSTRING' is seen as an option. - (If `-fno-STRING' is seen as an option, the opposite value is stored.) */ - -static const struct string_option -lang_f_options[] = -{ - {"emit-class-file", &flag_emit_class_files, 1}, - {"emit-class-files", &flag_emit_class_files, 1}, - {"filelist-file", &flag_filelist_file, 1}, - {"use-divide-subroutine", &flag_use_divide_subroutine, 1}, - {"use-boehm-gc", &flag_use_boehm_gc, 1}, - {"hash-synchronization", &flag_hash_synchronization, 1}, - {"jni", &flag_jni, 1}, - {"check-references", &flag_check_references, 1}, - {"force-classes-archive-check", &flag_force_classes_archive_check, 1}, - {"optimize-static-class-initialization", &flag_optimize_sci, 1 }, - {"indirect-dispatch", &flag_indirect_dispatch, 1}, - {"store-check", &flag_store_check, 1} -}; - -static const struct string_option -lang_W_options[] = -{ - { "redundant-modifiers", &flag_redundant, 1 }, - { "extraneous-semicolon", &flag_extraneous_semicolon, 1 }, - { "out-of-date", &flag_newer, 1 } -}; - JCF *current_jcf; /* Variable controlling how dependency tracking is enabled in @@ -241,18 +160,14 @@ struct language_function GTY(()) #define LANG_HOOKS_FINISH java_finish #undef LANG_HOOKS_INIT_OPTIONS #define LANG_HOOKS_INIT_OPTIONS java_init_options -#undef LANG_HOOKS_DECODE_OPTION -#define LANG_HOOKS_DECODE_OPTION java_decode_option +#undef LANG_HOOKS_HANDLE_OPTION +#define LANG_HOOKS_HANDLE_OPTION java_handle_option #undef LANG_HOOKS_POST_OPTIONS #define LANG_HOOKS_POST_OPTIONS java_post_options #undef LANG_HOOKS_PARSE_FILE #define LANG_HOOKS_PARSE_FILE java_parse_file -#undef LANG_HOOKS_UNSAFE_FOR_REEVAL -#define LANG_HOOKS_UNSAFE_FOR_REEVAL java_unsafe_for_reeval #undef LANG_HOOKS_MARK_ADDRESSABLE #define LANG_HOOKS_MARK_ADDRESSABLE java_mark_addressable -#undef LANG_HOOKS_EXPAND_EXPR -#define LANG_HOOKS_EXPAND_EXPR java_expand_expr #undef LANG_HOOKS_TRUTHVALUE_CONVERSION #define LANG_HOOKS_TRUTHVALUE_CONVERSION java_truthvalue_conversion #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL @@ -275,234 +190,165 @@ struct language_function GTY(()) #undef LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE #define LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE java_signed_or_unsigned_type +#undef LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN +#define LANG_HOOKS_TREE_DUMP_DUMP_TREE_FN java_dump_tree + +#undef LANG_HOOKS_GIMPLIFY_EXPR +#define LANG_HOOKS_GIMPLIFY_EXPR java_gimplify_expr + #undef LANG_HOOKS_TREE_INLINING_WALK_SUBTREES #define LANG_HOOKS_TREE_INLINING_WALK_SUBTREES java_tree_inlining_walk_subtrees -/* Each front end provides its own. */ -const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; +#undef LANG_HOOKS_DECL_OK_FOR_SIBCALL +#define LANG_HOOKS_DECL_OK_FOR_SIBCALL java_decl_ok_for_sibcall -/* Process an option that can accept a `no-' form. - Return 1 if option found, 0 otherwise. */ -static int -process_option_with_no (p, table, table_size) - const char *p; - const struct string_option *table; - int table_size; -{ - int j; +#undef LANG_HOOKS_GET_CALLEE_FNDECL +#define LANG_HOOKS_GET_CALLEE_FNDECL java_get_callee_fndecl - for (j = 0; j < table_size; j++) - { - if (!strcmp (p, table[j].string)) - { - *table[j].variable = table[j].on_value; - return 1; - } - if (p[0] == 'n' && p[1] == 'o' && p[2] == '-' - && ! strcmp (p+3, table[j].string)) - { - *table[j].variable = ! table[j].on_value; - return 1; - } - } +#undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION +#define LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION java_expand_body - return 0; -} +#undef LANG_HOOKS_CLEAR_BINDING_STACK +#define LANG_HOOKS_CLEAR_BINDING_STACK java_clear_binding_stack + +/* Each front end provides its own. */ +const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; /* * process java-specific compiler command-line options - * return 0, but do not complain if the option is not recognised. + * return 0, but do not complain if the option is not recognized. */ static int -java_decode_option (argc, argv) - int argc __attribute__ ((__unused__)); - char **argv; +java_handle_option (size_t scode, const char *arg, int value) { - char *p = argv[0]; - - jcf_path_init (); - - if (strcmp (p, "-version") == 0) - { - version_flag = 1; - /* We return 0 so that the caller can process this. */ - return 0; - } - -#define CLARG "-fcompile-resource=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - resource_name = p + sizeof (CLARG) - 1; - return 1; - } -#undef CLARG -#define CLARG "-fassume-compiled=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - add_assume_compiled (p + sizeof (CLARG) - 1, 0); - return 1; - } -#undef CLARG -#define CLARG "-fno-assume-compiled=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - add_assume_compiled (p + sizeof (CLARG) - 1, 1); - return 1; - } -#undef CLARG -#define CLARG "-fassume-compiled" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - add_assume_compiled ("", 0); - return 1; - } -#undef CLARG -#define CLARG "-fno-assume-compiled" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - add_assume_compiled ("", 1); - return 1; - } -#undef CLARG -#define CLARG "-fCLASSPATH=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_classpath_arg (p + sizeof (CLARG) - 1); - return 1; - } -#undef CLARG -#define CLARG "-fclasspath=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_classpath_arg (p + sizeof (CLARG) - 1); - return 1; - } -#undef CLARG -#define CLARG "-fbootclasspath=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_bootclasspath_arg (p + sizeof (CLARG) - 1); - return 1; - } -#undef CLARG -#define CLARG "-fextdirs=" - if (strncmp (p, CLARG, sizeof (CLARG) - 1) == 0) - { - jcf_path_extdirs_arg (p + sizeof (CLARG) - 1); - return 1; - } -#undef CLARG - else if (strncmp (p, "-I", 2) == 0) - { - jcf_path_include_arg (p + 2); - return 1; - } + enum opt_code code = (enum opt_code) scode; -#define ARG "-foutput-class-dir=" - if (strncmp (p, ARG, sizeof (ARG) - 1) == 0) - { - jcf_write_base_directory = p + sizeof (ARG) - 1; - return 1; - } -#undef ARG -#define ARG "-fencoding=" - if (strncmp (p, ARG, sizeof (ARG) - 1) == 0) - { - current_encoding = p + sizeof (ARG) - 1; - return 1; - } -#undef ARG -#define ARG "-finline-functions" - if (strncmp (p, ARG, sizeof (ARG) - 1) == 0) - { - flag_inline_functions = 1; - flag_really_inline = 1; - return 1; - } -#undef ARG - - if (p[0] == '-' && p[1] == 'f') - { - /* Some kind of -f option. - P's value is the option sans `-f'. - Search for it in the table of options. */ - p += 2; - if (process_option_with_no (p, lang_f_options, - ARRAY_SIZE (lang_f_options))) - return 1; - return dump_switch_p (p); - } - - if (strcmp (p, "-Wall") == 0) + switch (code) { - flag_wall = 1; - flag_redundant = 1; - flag_extraneous_semicolon = 1; - /* When -Wall given, enable -Wunused. We do this because the C - compiler does it, and people expect it. */ - set_Wunused (1); - return 1; - } + case OPT_I: + jcf_path_include_arg (arg); + break; - if (p[0] == '-' && p[1] == 'W') - { - /* Skip `-W' and see if we accept the option or its `no-' form. */ - p += 2; - return process_option_with_no (p, lang_W_options, - ARRAY_SIZE (lang_W_options)); - } + case OPT_M: + jcf_dependency_init (1); + dependency_tracking |= DEPEND_ENABLE; + break; - if (strcmp (p, "-MD") == 0) - { + case OPT_MD_: jcf_dependency_init (1); dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE; - return 1; - } - else if (strcmp (p, "-MMD") == 0) - { + break; + + case OPT_MF: + jcf_dependency_set_dep_file (arg); + dependency_tracking |= DEPEND_FILE_ALREADY_SET; + break; + + case OPT_MM: jcf_dependency_init (0); - dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE; - return 1; - } - else if (strcmp (p, "-M") == 0) - { - jcf_dependency_init (1); dependency_tracking |= DEPEND_ENABLE; - return 1; - } - else if (strcmp (p, "-MM") == 0) - { + break; + + case OPT_MMD_: jcf_dependency_init (0); - dependency_tracking |= DEPEND_ENABLE; - return 1; - } - else if (strcmp (p, "-MP") == 0) - { + dependency_tracking |= DEPEND_SET_FILE | DEPEND_ENABLE; + break; + + case OPT_MP: jcf_dependency_print_dummies (); - return 1; - } - else if (strcmp (p, "-MT") == 0) - { - jcf_dependency_set_target (argv[1]); + break; + + case OPT_MT: + jcf_dependency_set_target (arg); dependency_tracking |= DEPEND_TARGET_SET; - return 2; - } - else if (strcmp (p, "-MF") == 0) - { - jcf_dependency_set_dep_file (argv[1]); - dependency_tracking |= DEPEND_FILE_ALREADY_SET; - return 2; + break; + + case OPT_Wall: + flag_wall = value; + flag_redundant = value; + flag_extraneous_semicolon = value; + /* When -Wall given, enable -Wunused. We do this because the C + compiler does it, and people expect it. */ + set_Wunused (value); + break; + + case OPT_fenable_assertions_: + add_enable_assert (arg, value); + break; + + case OPT_fenable_assertions: + add_enable_assert ("", value); + break; + + case OPT_fdisable_assertions_: + add_enable_assert (arg, !value); + break; + + case OPT_fdisable_assertions: + add_enable_assert ("", !value); + break; + + case OPT_fassume_compiled_: + add_assume_compiled (arg, !value); + break; + + case OPT_fassume_compiled: + add_assume_compiled ("", !value); + break; + + case OPT_fbootclasspath_: + jcf_path_bootclasspath_arg (arg); + break; + + case OPT_fclasspath_: + case OPT_fCLASSPATH_: + jcf_path_classpath_arg (arg); + break; + + case OPT_fcompile_resource_: + resource_name = arg; + break; + + case OPT_fdump_: + if (!dump_switch_p (arg)) + return 0; + break; + + case OPT_fencoding_: + current_encoding = arg; + break; + + case OPT_fextdirs_: + jcf_path_extdirs_arg (arg); + break; + + case OPT_finline_functions: + flag_inline_functions = value; + flag_really_inline = value; + break; + + case OPT_foutput_class_dir_: + jcf_write_base_directory = arg; + break; + + case OPT_version: + v_flag = 1; + break; + + default: + if (cl_options[code].flags & CL_Java) + break; + abort(); } - return 0; + return 1; } /* Global open file. */ FILE *finput; -static const char * -java_init (filename) - const char *filename; +static bool +java_init (void) { #if 0 extern int flag_minimal_debug; @@ -512,79 +358,29 @@ java_init (filename) if (flag_inline_functions) flag_inline_trees = 1; - /* Open input file. */ + /* FIXME: Indirect dispatch isn't yet compatible with static class + init optimization. */ + if (flag_indirect_dispatch) + always_initialize_class_p = true; - if (filename == 0 || !strcmp (filename, "-")) - { - finput = stdin; - filename = "stdin"; + /* Force minimum function alignment if g++ uses the least significant + bit of function pointers to store the virtual bit. This is required + to keep vtables compatible. */ + if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn + && force_align_functions_log < 1) + force_align_functions_log = 1; - if (dependency_tracking) - error ("can't do dependency tracking with input from stdin"); - } - else - { - if (dependency_tracking) - { - char *dot; - - /* If the target is set and the output filename is set, then - there's no processing to do here. Otherwise we must - compute one or the other. */ - if (! ((dependency_tracking & DEPEND_TARGET_SET) - && (dependency_tracking & DEPEND_FILE_ALREADY_SET))) - { - dot = strrchr (filename, '.'); - if (dot == NULL) - error ("couldn't determine target name for dependency tracking"); - else - { - char *buf = (char *) xmalloc (dot - filename + - 3 + sizeof (TARGET_OBJECT_SUFFIX)); - strncpy (buf, filename, dot - filename); - - /* If emitting class files, we might have multiple - targets. The class generation code takes care of - registering them. Otherwise we compute the - target name here. */ - if ((dependency_tracking & DEPEND_TARGET_SET)) - ; /* Nothing. */ - else if (flag_emit_class_files) - jcf_dependency_set_target (NULL); - else - { - strcpy (buf + (dot - filename), TARGET_OBJECT_SUFFIX); - jcf_dependency_set_target (buf); - } - - if ((dependency_tracking & DEPEND_FILE_ALREADY_SET)) - ; /* Nothing. */ - else if ((dependency_tracking & DEPEND_SET_FILE)) - { - strcpy (buf + (dot - filename), ".d"); - jcf_dependency_set_dep_file (buf); - } - else - jcf_dependency_set_dep_file ("-"); - - free (buf); - } - } - } - } - - jcf_path_init (); - jcf_path_seal (version_flag); + jcf_path_seal (v_flag); java_init_decl_processing (); using_eh_for_cleanups (); - return filename; + return true; } static void -java_finish () +java_finish (void) { jcf_dependency_write (); } @@ -602,9 +398,7 @@ static int decl_bufpos = 0; It length is given by LEN; -1 means the string is nul-terminated. */ static void -put_decl_string (str, len) - const char *str; - int len; +put_decl_string (const char *str, int len) { if (len < 0) len = strlen (str); @@ -613,12 +407,12 @@ put_decl_string (str, len) if (decl_buf == NULL) { decl_buflen = len + 100; - decl_buf = (char *) xmalloc (decl_buflen); + decl_buf = xmalloc (decl_buflen); } else { decl_buflen *= 2; - decl_buf = (char *) xrealloc (decl_buf, decl_buflen); + decl_buf = xrealloc (decl_buf, decl_buflen); } } strcpy (decl_buf + decl_bufpos, str); @@ -628,8 +422,7 @@ put_decl_string (str, len) /* Append to decl_buf a printable name for NODE. */ static void -put_decl_node (node) - tree node; +put_decl_node (tree node) { int was_pointer = 0; if (TREE_CODE (node) == POINTER_TYPE) @@ -637,8 +430,7 @@ put_decl_node (node) node = TREE_TYPE (node); was_pointer = 1; } - if (TREE_CODE_CLASS (TREE_CODE (node)) == 'd' - && DECL_NAME (node) != NULL_TREE) + if (DECL_P (node) && DECL_NAME (node) != NULL_TREE) { if (TREE_CODE (node) == FUNCTION_DECL) { @@ -671,8 +463,7 @@ put_decl_node (node) else put_decl_node (DECL_NAME (node)); } - else if (TREE_CODE_CLASS (TREE_CODE (node)) == 't' - && TYPE_NAME (node) != NULL_TREE) + else if (TYPE_P (node) && TYPE_NAME (node) != NULL_TREE) { if (TREE_CODE (node) == RECORD_TYPE && TYPE_ARRAY_P (node)) { @@ -704,28 +495,14 @@ put_decl_node (node) which is also called directly by java_print_error_function. */ const char * -lang_printable_name (decl, v) - tree decl; - int v __attribute__ ((__unused__)); +lang_printable_name (tree decl, int v) { decl_bufpos = 0; - put_decl_node (decl); - put_decl_string ("", 1); - return decl_buf; -} - -/* Does the same thing that lang_printable_name, but add a leading - space to the DECL name string -- With Leading Space. */ - -const char * -lang_printable_name_wls (decl, v) - tree decl; - int v __attribute__ ((__unused__)); -{ - decl_bufpos = 1; - put_decl_node (decl); + if (v == 0 && TREE_CODE (decl) == FUNCTION_DECL) + put_decl_node (DECL_NAME (decl)); + else + put_decl_node (decl); put_decl_string ("", 1); - decl_buf [0] = ' '; return decl_buf; } @@ -735,9 +512,8 @@ lang_printable_name_wls (decl, v) static GTY(()) tree last_error_function_context; static GTY(()) tree last_error_function; static void -java_print_error_function (context, file) - diagnostic_context *context __attribute__((__unused__)); - const char *file; +java_print_error_function (diagnostic_context *context ATTRIBUTE_UNUSED, + const char *file) { /* Don't print error messages with bogus function prototypes. */ if (inhibit_error_function_printing) @@ -750,7 +526,7 @@ java_print_error_function (context, file) fprintf (stderr, "%s: ", file); last_error_function_context = DECL_CONTEXT (current_function_decl); - fprintf (stderr, "In class `%s':\n", + fprintf (stderr, "In class '%s':\n", lang_printable_name (last_error_function_context, 0)); } if (last_error_function != current_function_decl) @@ -763,8 +539,8 @@ java_print_error_function (context, file) else { const char *name = lang_printable_name (current_function_decl, 2); - fprintf (stderr, "In %s `%s':\n", - (DECL_CONSTRUCTOR_P (current_function_decl) ? "constructor" + fprintf (stderr, "In %s '%s':\n", + (DECL_CONSTRUCTOR_P (current_function_decl) ? "constructor" : "method"), name); } @@ -781,14 +557,15 @@ java_print_error_function (context, file) 2, function prototypes are fully resolved and can be printed when reporting errors. */ -void lang_init_source (level) - int level; +void +lang_init_source (int level) { inhibit_error_function_printing = (level == 1); } -static void -java_init_options () +static unsigned int +java_init_options (unsigned int argc ATTRIBUTE_UNUSED, + const char **argv ATTRIBUTE_UNUSED) { flag_bounds_check = 1; flag_exceptions = 1; @@ -796,10 +573,20 @@ java_init_options () /* In Java floating point operations never trap. */ flag_trapping_math = 0; + + /* In Java arithmetic overflow always wraps around. */ + flag_wrapv = 1; + + /* Java requires left-to-right evaluation of subexpressions. */ + flag_evaluation_order = 1; + + jcf_path_init (); + + return CL_Java; } static bool -java_can_use_bit_fields_p () +java_can_use_bit_fields_p (void) { /* The bit-field optimizations cause problems when generating class files. */ @@ -808,20 +595,83 @@ java_can_use_bit_fields_p () /* Post-switch processing. */ static bool -java_post_options () +java_post_options (const char **pfilename) { - /* Use tree inlining if possible. Function instrumentation is only - done in the RTL level, so we disable tree inlining. */ - if (! flag_instrument_function_entry_exit) + const char *filename = *pfilename; + + /* Use tree inlining. */ + if (!flag_no_inline) + flag_no_inline = 1; + if (flag_inline_functions) { - if (!flag_no_inline) - flag_no_inline = 1; - if (flag_inline_functions) + flag_inline_trees = 2; + flag_inline_functions = 0; + } + + /* Open input file. */ + + if (filename == 0 || !strcmp (filename, "-")) + { + finput = stdin; + filename = "stdin"; + + if (dependency_tracking) + error ("can't do dependency tracking with input from stdin"); + } + else + { + if (dependency_tracking) { - flag_inline_trees = 2; - flag_inline_functions = 0; + char *dot; + + /* If the target is set and the output filename is set, then + there's no processing to do here. Otherwise we must + compute one or the other. */ + if (! ((dependency_tracking & DEPEND_TARGET_SET) + && (dependency_tracking & DEPEND_FILE_ALREADY_SET))) + { + dot = strrchr (filename, '.'); + if (dot == NULL) + error ("couldn't determine target name for dependency tracking"); + else + { + char *buf = xmalloc (dot - filename + + 3 + sizeof (TARGET_OBJECT_SUFFIX)); + strncpy (buf, filename, dot - filename); + + /* If emitting class files, we might have multiple + targets. The class generation code takes care of + registering them. Otherwise we compute the + target name here. */ + if ((dependency_tracking & DEPEND_TARGET_SET)) + ; /* Nothing. */ + else if (flag_emit_class_files) + jcf_dependency_set_target (NULL); + else + { + strcpy (buf + (dot - filename), TARGET_OBJECT_SUFFIX); + jcf_dependency_set_target (buf); + } + + if ((dependency_tracking & DEPEND_FILE_ALREADY_SET)) + ; /* Nothing. */ + else if ((dependency_tracking & DEPEND_SET_FILE)) + { + strcpy (buf + (dot - filename), ".d"); + jcf_dependency_set_dep_file (buf); + } + else + jcf_dependency_set_dep_file ("-"); + + free (buf); + } + } } } +#ifdef USE_MAPPED_LOCATION + linemap_add (&line_table, LC_ENTER, false, filename, 0); + linemap_add (&line_table, LC_RENAME, false, "", 0); +#endif /* Initialize the compiler back end. */ return false; @@ -830,8 +680,7 @@ java_post_options () /* Return either DECL or its known constant value (if it has one). */ tree -decl_constant_value (decl) - tree decl; +decl_constant_value (tree decl) { if (/* Don't change a variable array bound or initial value to a constant in a place where a variable is invalid. */ @@ -853,12 +702,11 @@ decl_constant_value (decl) /* Walk the language specific tree nodes during inlining. */ static tree -java_tree_inlining_walk_subtrees (tp,subtrees,func,data,htab) - tree *tp ATTRIBUTE_UNUSED; - int *subtrees ATTRIBUTE_UNUSED; - walk_tree_fn func ATTRIBUTE_UNUSED; - void *data ATTRIBUTE_UNUSED; - void *htab ATTRIBUTE_UNUSED; +java_tree_inlining_walk_subtrees (tree *tp ATTRIBUTE_UNUSED, + int *subtrees ATTRIBUTE_UNUSED, + walk_tree_fn func ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED, + struct pointer_set_t *pset ATTRIBUTE_UNUSED) { enum tree_code code; tree result; @@ -866,7 +714,7 @@ java_tree_inlining_walk_subtrees (tp,subtrees,func,data,htab) #define WALK_SUBTREE(NODE) \ do \ { \ - result = walk_tree (&(NODE), func, data, htab); \ + result = walk_tree (&(NODE), func, data, pset); \ if (result) \ return result; \ } \ @@ -880,41 +728,302 @@ java_tree_inlining_walk_subtrees (tp,subtrees,func,data,htab) switch (code) { case BLOCK: - if (BLOCK_EXPR_BODY (t)) - { - tree *prev = &BLOCK_EXPR_BODY (*tp); - while (*prev) - { - WALK_SUBTREE (*prev); - prev = &TREE_CHAIN (*prev); - } - } + WALK_SUBTREE (BLOCK_EXPR_BODY (t)); return NULL_TREE; - break; default: return NULL_TREE; } + + #undef WALK_SUBTREE +} + +/* Every call to a static constructor has an associated boolean + variable which is in the outermost scope of the calling method. + This variable is used to avoid multiple calls to the static + constructor for each class. + + It looks something like this: + + foo () + { + boolean dummy = OtherClass.is_initialized; + + ... + + if (! dummy) + OtherClass.initialize(); + + ... use OtherClass.data ... + } + + Each of these boolean variables has an entry in the + DECL_FUNCTION_INIT_TEST_TABLE of a method. When inlining a method + we must merge the DECL_FUNCTION_INIT_TEST_TABLE from the function + being inlined and create the boolean variables in the outermost + scope of the method being inlined into. */ + +/* Create a mapping from a boolean variable in a method being inlined + to one in the scope of the method being inlined into. */ + +static int +merge_init_test_initialization (void **entry, void *x) +{ + struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry; + splay_tree decl_map = (splay_tree)x; + splay_tree_node n; + tree *init_test_decl; + + /* See if we have remapped this declaration. If we haven't there's + a bug in the inliner. */ + n = splay_tree_lookup (decl_map, (splay_tree_key) ite->value); + if (! n) + abort (); + + /* Create a new entry for the class and its remapped boolean + variable. If we already have a mapping for this class we've + already initialized it, so don't overwrite the value. */ + init_test_decl = java_treetreehash_new + (DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl), ite->key); + if (!*init_test_decl) + *init_test_decl = (tree)n->value; + + /* This fixes a weird case. + + The front end assumes that once we have called a method that + initializes some class, we can assume the class is initialized. It + does this by setting the DECL_INITIAL of the init_test_decl for that + class, and no initializations are emitted for that class. + + However, what if the method that is suppoed to do the initialization + is itself inlined in the caller? When expanding the called method + we'll assume that the class initialization has already been done, + because the DECL_INITIAL of the init_test_decl is set. + + To fix this we remove the DECL_INITIAL (in the caller scope) of all + the init_test_decls corresponding to classes initialized by the + inlined method. This makes the caller no longer assume that the + method being inlined does any class initializations. */ + DECL_INITIAL (*init_test_decl) = NULL; + + return true; +} + +/* Merge the DECL_FUNCTION_INIT_TEST_TABLE from the function we're + inlining. */ + +void +java_inlining_merge_static_initializers (tree fn, void *decl_map) +{ + htab_traverse + (DECL_FUNCTION_INIT_TEST_TABLE (fn), + merge_init_test_initialization, decl_map); } -/* Called from unsafe_for_reeval. */ +/* Lookup a DECL_FUNCTION_INIT_TEST_TABLE entry in the method we're + inlining into. If we already have a corresponding entry in that + class we don't need to create another one, so we create a mapping + from the variable in the inlined class to the corresponding + pre-existing one. */ + static int -java_unsafe_for_reeval (t) - tree t; +inline_init_test_initialization (void **entry, void *x) +{ + struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry; + splay_tree decl_map = (splay_tree)x; + + tree h = java_treetreehash_find + (DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl), ite->key); + if (! h) + return true; + splay_tree_insert (decl_map, + (splay_tree_key) ite->value, + (splay_tree_value) h); + return true; +} + +/* Look up the boolean variables in the DECL_FUNCTION_INIT_TEST_TABLE + of a method being inlined. For each hone, if we already have a + variable associated with the same class in the method being inlined + into, create a new mapping for it. */ + +void +java_inlining_map_static_initializers (tree fn, void *decl_map) { - switch (TREE_CODE (t)) + htab_traverse + (DECL_FUNCTION_INIT_TEST_TABLE (fn), + inline_init_test_initialization, decl_map); +} + +/* Avoid voluminous output for deep recursion of compound exprs. */ + +static void +dump_compound_expr (dump_info_p di, tree t) +{ + int i; + + for (i=0; i<2; i++) { + switch (TREE_CODE (TREE_OPERAND (t, i))) + { + case COMPOUND_EXPR: + dump_compound_expr (di, TREE_OPERAND (t, i)); + break; + + case EXPR_WITH_FILE_LOCATION: + { + tree wfl_node = EXPR_WFL_NODE (TREE_OPERAND (t, i)); + dump_child ("expr", wfl_node); + break; + } + + default: + dump_child ("expr", TREE_OPERAND (t, i)); + } + } +} + +static bool +java_dump_tree (void *dump_info, tree t) +{ + enum tree_code code; + dump_info_p di = (dump_info_p) dump_info; + + /* Figure out what kind of node this is. */ + code = TREE_CODE (t); + + switch (code) + { + case FUNCTION_DECL: + dump_child ("args", DECL_ARGUMENTS (t)); + if (DECL_EXTERNAL (t)) + dump_string (di, "undefined"); + if (TREE_PUBLIC (t)) + dump_string (di, "extern"); + else + dump_string (di, "static"); + if (DECL_LANG_SPECIFIC (t)) + dump_child ("body", DECL_FUNCTION_BODY (t)); + if (DECL_LANG_SPECIFIC (t) && !dump_flag (di, TDF_SLIM, t)) + dump_child ("inline body", DECL_SAVED_TREE (t)); + return true; + + case RETURN_EXPR: + dump_child ("expr", TREE_OPERAND (t, 0)); + return true; + + case GOTO_EXPR: + dump_child ("goto", TREE_OPERAND (t, 0)); + return true; + + case LABEL_EXPR: + dump_child ("label", TREE_OPERAND (t, 0)); + return true; + + case LABELED_BLOCK_EXPR: + dump_child ("label", TREE_OPERAND (t, 0)); + dump_child ("block", TREE_OPERAND (t, 1)); + return true; + + case EXIT_BLOCK_EXPR: + dump_child ("block", TREE_OPERAND (t, 0)); + dump_child ("val", TREE_OPERAND (t, 1)); + return true; + case BLOCK: - /* Our expander tries to expand the variables twice. Boom. */ - if (BLOCK_EXPR_DECLS (t) != NULL) - return 2; - return unsafe_for_reeval (BLOCK_EXPR_BODY (t)); + if (BLOCK_EXPR_BODY (t)) + { + tree local = BLOCK_VARS (t); + while (local) + { + tree next = TREE_CHAIN (local); + dump_child ("var", local); + local = next; + } + + { + tree block = BLOCK_EXPR_BODY (t); + dump_child ("body", block); + block = TREE_CHAIN (block); + } + } + return true; + + case COMPOUND_EXPR: + if (!dump_flag (di, TDF_SLIM, t)) + return false; + dump_compound_expr (di, t); + return true; default: break; } + return false; +} + +/* Java calls can't, in general, be sibcalls because we need an + accurate stack trace in order to guarantee correct operation of + methods such as Class.forName(String) and + SecurityManager.getClassContext(). */ + +static bool +java_decl_ok_for_sibcall (tree decl) +{ + return decl != NULL && DECL_CONTEXT (decl) == output_class; +} + +/* Given a call_expr, try to figure out what its target might be. In + the case of an indirection via the atable, search for the decl. If + the decl is external, we return NULL. If we don't, the optimizer + will replace the indirection with a direct call, which undoes the + purpose of the atable indirection. */ +static tree +java_get_callee_fndecl (tree call_expr) +{ + tree method, table, element, atable_methods; + + HOST_WIDE_INT index; + + if (TREE_CODE (call_expr) != CALL_EXPR) + return NULL; + method = TREE_OPERAND (call_expr, 0); + STRIP_NOPS (method); + if (TREE_CODE (method) != ARRAY_REF) + return NULL; + table = TREE_OPERAND (method, 0); + if (! DECL_LANG_SPECIFIC(table) + || !DECL_OWNER (table) + || TYPE_ATABLE_DECL (DECL_OWNER (table)) != table) + return NULL; + + atable_methods = TYPE_ATABLE_METHODS (DECL_OWNER (table)); + index = TREE_INT_CST_LOW (TREE_OPERAND (method, 1)); + + /* FIXME: Replace this for loop with a hash table lookup. */ + for (element = atable_methods; element; element = TREE_CHAIN (element)) + { + if (index == 1) + { + tree purpose = TREE_PURPOSE (element); + if (TREE_CODE (purpose) == FUNCTION_DECL + && ! DECL_EXTERNAL (purpose)) + return purpose; + else + return NULL; + } + --index; + } - return -1; + return NULL; +} + + +/* Clear the binding stack. */ +static void +java_clear_binding_stack (void) +{ + while (!global_bindings_p ()) + poplevel (0, 0, 0); } #include "gt-java-lang.h"