Don't use RTL inlining. Fix for PR java/6820.

* lang.c (LANG_HOOKS_POST_OPTIONS): Define.
	(flag_really_inline): New.
	(java_decode_option): Set flag_really_inline if -finline-functions
	is seen.
	(java_post_options): New function. Turn off inlining unless
	flag_really_inline is set.

From-SVN: r54487
This commit is contained in:
Bryce McKinlay 2002-06-11 06:20:12 +00:00 committed by Bryce McKinlay
parent 9b81c803fd
commit 22bc3b8e89
2 changed files with 38 additions and 0 deletions

View File

@ -1,3 +1,13 @@
2002-06-10 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
Don't use RTL inlining. Fix for PR java/6820.
* lang.c (LANG_HOOKS_POST_OPTIONS): Define.
(flag_really_inline): New.
(java_decode_option): Set flag_really_inline if -finline-functions
is seen.
(java_post_options): New function. Turn off inlining unless
flag_really_inline is set.
2002-06-08 H.J. Lu (hjl@gnu.org)
* jcf-path.c (jcf_path_init): Allocate 1 more byte for string.

View File

@ -51,6 +51,8 @@ struct string_option
static const char *java_init PARAMS ((const char *));
static void java_finish PARAMS ((void));
static void java_init_options PARAMS ((void));
static void 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));
@ -163,6 +165,10 @@ 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
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
@ -216,6 +222,8 @@ static int dependency_tracking = 0;
#define LANG_HOOKS_INIT_OPTIONS java_init_options
#undef LANG_HOOKS_DECODE_OPTION
#define LANG_HOOKS_DECODE_OPTION java_decode_option
#undef LANG_HOOKS_POST_OPTIONS
#define LANG_HOOKS_POST_OPTIONS java_post_options
#undef LANG_HOOKS_SET_YYDEBUG
#define LANG_HOOKS_SET_YYDEBUG java_set_yydebug
@ -353,6 +361,14 @@ java_decode_option (argc, argv)
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')
{
@ -762,3 +778,15 @@ java_init_options ()
flag_exceptions = 1;
flag_non_call_exceptions = 1;
}
/* Post-switch processing. */
static void
java_post_options ()
{
/* Turn off RTL inliner unless -finline-functions was really specified. */
if (flag_really_inline == 0)
{
flag_no_inline = 1;
flag_inline_functions = 0;
}
}