aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorSteven Bosscher <stevenb@suse.de>2004-11-24 19:45:32 +0000
committerSteven Bosscher <steven@gcc.gnu.org>2004-11-24 19:45:32 +0000
commit39afeb1aad63cf3e2dcfb7a93e20f014bc5dc28e (patch)
treee03bd7fb108fe9325c02bc63b1552f84968a2f97 /gcc/java
parent41f683efe5ab3b56b38ae6be0320232bf444dd83 (diff)
downloadgcc-39afeb1aad63cf3e2dcfb7a93e20f014bc5dc28e.zip
gcc-39afeb1aad63cf3e2dcfb7a93e20f014bc5dc28e.tar.gz
gcc-39afeb1aad63cf3e2dcfb7a93e20f014bc5dc28e.tar.bz2
c-opts.c (c_common_post_options): Don't clear flag_inline_functions.
gcc/ * c-opts.c (c_common_post_options): Don't clear flag_inline_functions. * dojump.c (clear_pending_stack_adjust): Remove check on flag_inline_functions, it's always true. * config/alpha/alpha.md (movdi_er_maybe_g): Remove splitter that can never trigger. * config/c4x/c4x.h (TARGET_CPU_CPP_BUILTINS): Don't look at flag_inline_trees, now that flag_inline_functions is never cleared. * config/pdp11/pdp11.h (OPTIMIZATION_OPTIONS): Don't set flag_inline_functions at optimization levels greater than or equal to 3. This is already done by default. ada/ * misc.c (gnat_post_options): Don't clear flag_inline_functions. cp/ * decl.c (cxx_init_decl_processing): Don't clear flag_inline_functions. fortran/ * options.c (gfc_post_options): Don't clear flag_inline_functions. java/ * class.c (make_class_data): Don't check flag_inline_functions. * lang.c (flag_really_inline): Remove unused flag. (java_handle_option): Don't set it here. Remove special handling of flag_inline_functions for Java. (java_init): Don't set flag_inline_trees here. Already done... (java_post_options): ...here. Don't clear flag_inline_functions. From-SVN: r91190
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog9
-rw-r--r--gcc/java/class.c2
-rw-r--r--gcc/java/lang.c17
3 files changed, 11 insertions, 17 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ab96bfc..272e8c5 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,5 +1,14 @@
2004-11-24 Steven Bosscher <stevenb@suse.de>
+ * class.c (make_class_data): Don't check flag_inline_functions.
+ * lang.c (flag_really_inline): Remove unused flag.
+ (java_handle_option): Don't set it here. Remove special handling
+ of flag_inline_functions for Java.
+ (java_init): Don't set flag_inline_trees here. Already done...
+ (java_post_options): ...here. Don't clear flag_inline_functions.
+
+2004-11-24 Steven Bosscher <stevenb@suse.de>
+
* java-gimplify.c (java_gimplify_labeled_block_expr): New function.
(java_gimplify_exit_block_expr): New function.
(java_gimplify_expr): Use them to gimplify EXIT_BLOCK_EXPR and
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 6e6bded..543bdf2 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1618,7 +1618,7 @@ make_class_data (tree type)
tree init;
if (METHOD_PRIVATE (method)
&& ! flag_keep_inline_functions
- && (flag_inline_functions || optimize))
+ && optimize)
continue;
init = make_method_value (method);
method_count++;
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index ad388da..be789fe 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -131,10 +131,6 @@ const char *current_encoding = NULL;
/* When nonzero, print extra version information. */
static int v_flag = 0;
-/* Set nonzero if the user specified -finline-functions on the command
- line. */
-int flag_really_inline = 0;
-
JCF *current_jcf;
/* Variable controlling how dependency tracking is enabled in
@@ -322,11 +318,6 @@ java_handle_option (size_t scode, const char *arg, int value)
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;
@@ -355,9 +346,6 @@ java_init (void)
flag_minimal_debug = 0;
#endif
- if (flag_inline_functions)
- flag_inline_trees = 1;
-
/* FIXME: Indirect dispatch isn't yet compatible with static class
init optimization. */
if (flag_indirect_dispatch)
@@ -603,10 +591,7 @@ java_post_options (const char **pfilename)
if (!flag_no_inline)
flag_no_inline = 1;
if (flag_inline_functions)
- {
- flag_inline_trees = 2;
- flag_inline_functions = 0;
- }
+ flag_inline_trees = 2;
/* Open input file. */