From 096f22f42494fad3990d6a2d74a9844dd6af977b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 15 Jun 2004 12:46:07 +0000 Subject: function.h (struct function): Remove cannot_inline field. gcc/ChangeLog: 2004-06-15 Paolo Bonzini * function.h (struct function): Remove cannot_inline field. (current_function_cannot_inline): Remove. * passes.c (rest_of_compilation): Reset DECL_DEFER_OUTPUT. Simplify conditionals to ignore warn_return_type. * tree-optimize.c (tree_rest_of_compilation): Do not reset DECL_DEFER_OUTPUT. * objc/objc-act.c (build_module_descriptor, finish_method_def): Do not set current_function_cannot_inline. gcc/java/ChangeLog: 2004-06-15 Paolo Bonzini * class.c (emit_register_classes): Make the function uninlinable, do not set current_function_cannot_inline. * resource.c (write_resource_constructor): Do not reset flag_inline_functions around rest_of_compilation. gcc/cp/ChangeLog: 2004-06-15 Paolo Bonzini * cp-tree.h (struct language_function): Remove cannot_inline. * decl.c (save_function_data): cannot_inline is no more. (cxx_push_function_context): Likewise. * decl2.c (start_objects, start_static_storage_duration_function): Reset DECL_INLINE, set DECL_UNINLINABLE. From-SVN: r83181 --- gcc/java/resource.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gcc/java/resource.c') diff --git a/gcc/java/resource.c b/gcc/java/resource.c index dc42a6f..5ebbf5e 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -151,14 +151,10 @@ write_resource_constructor (void) input_location = DECL_SOURCE_LOCATION (init_decl); expand_function_end (); poplevel (1, 0, 1); - { - /* Force generation, even with -O3 or deeper. Gross hack. - FIXME. */ - int saved_flag = flag_inline_functions; - flag_inline_functions = 0; - rest_of_compilation (init_decl); - flag_inline_functions = saved_flag; - } + + /* rest_of_compilation forces generation even if -finline-functions. */ + rest_of_compilation (init_decl); + current_function_decl = NULL_TREE; if (targetm.have_ctors_dtors) targetm.asm_out.constructor (XEXP (DECL_RTL (init_decl), 0), -- cgit v1.1