+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-10 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* gjavah.c (throwable_p): Accept argument as either a classname or
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));
/* 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
#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_PARSE_FILE
#define LANG_HOOKS_PARSE_FILE java_parse_file
#undef LANG_HOOKS_MARK_ADDRESSABLE
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')
{
flag_trapping_math = 0;
}
+/* 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;
+ }
+}
+
#include "gt-java-lang.h"