This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [RFC] PR 12389
> > If not, perhaps we should keep the test just
> > cgraph_possibly_inlined_p (decl) and add a comment to it and to testcase
> > that we may want to change mind in future if we find some use for this.
>
> Makes sense to me.
OK, this way we have dwarf2 specific decisions on whether to emit
abstract DIE gone. Is the attached patch OK together with (subset of)
the testcases I sent earlier?
I will update similar code in other debug drivers separately.
Thank you!
Honza
2003-10-19 Jan Hubicka <jh@suse.cz>
* Makefile.in (dwarf2out.o): Depend on cgraph.h.
* cgraph.c (cgraph_function_possibly_inlined_p): New function.
* cgraph.h (cgraph_function_possibly_inlined_p): Declare.
(cgraph_global_info): Add flag inlined
* dwarf2out.c (gen_subprogram_die, gen_decl_die): Use
cgraph_function_possibly_inded_p
* cgraphunit.c (mark_inline): Set inlined flag.
* toplev.c (rest_of_decl_compilation): Call outlining_inline_function
only for possibly inlined functions.
* c-decl.c (duplicate_decls): Never output abstract DIE representing old
body of function.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1178
diff -c -3 -p -r1.1178 Makefile.in
*** Makefile.in 20 Oct 2003 23:45:41 -0000 1.1178
--- Makefile.in 21 Oct 2003 14:46:20 -0000
*************** dwarf2out.o : dwarf2out.c $(CONFIG_H) $(
*** 1583,1589 ****
$(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h output.h $(DIAGNOSTIC_H) real.h \
hard-reg-set.h $(REGS_H) $(EXPR_H) libfuncs.h toplev.h dwarf2out.h varray.h \
$(GGC_H) except.h dwarf2asm.h $(TM_P_H) langhooks.h $(HASHTAB_H) \
! gt-dwarf2out.h $(TARGET_H)
dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) flags.h $(RTL_H) \
$(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
vmsdbgout.o : vmsdbgout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
--- 1583,1589 ----
$(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h output.h $(DIAGNOSTIC_H) real.h \
hard-reg-set.h $(REGS_H) $(EXPR_H) libfuncs.h toplev.h dwarf2out.h varray.h \
$(GGC_H) except.h dwarf2asm.h $(TM_P_H) langhooks.h $(HASHTAB_H) \
! gt-dwarf2out.h $(TARGET_H) cgraph.h
dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) flags.h $(RTL_H) \
$(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
vmsdbgout.o : vmsdbgout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
Index: c-decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-decl.c,v
retrieving revision 1.454
diff -c -3 -p -r1.454 c-decl.c
*** c-decl.c 4 Oct 2003 16:49:26 -0000 1.454
--- c-decl.c 21 Oct 2003 14:46:21 -0000
*************** duplicate_decls (tree newdecl, tree oldd
*** 1406,1412 ****
been written out yet. */
if (new_is_definition && DECL_INITIAL (olddecl))
{
! if (TREE_USED (olddecl))
(*debug_hooks->outlining_inline_function) (olddecl);
/* The new defn must not be inline. */
--- 1406,1415 ----
been written out yet. */
if (new_is_definition && DECL_INITIAL (olddecl))
{
! if (TREE_USED (olddecl)
! /* ??? In unit-at-a-time mode we never actually use the inline
! version of the function and use new body for inlining instead. */
! && !flag_unit_at_a_time)
(*debug_hooks->outlining_inline_function) (olddecl);
/* The new defn must not be inline. */
Index: cgraph.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.c,v
retrieving revision 1.32
diff -c -3 -p -r1.32 cgraph.c
*** cgraph.c 2 Oct 2003 15:11:40 -0000 1.32
--- cgraph.c 21 Oct 2003 14:46:21 -0000
*************** cgraph_varpool_assemble_pending_decls (v
*** 531,535 ****
--- 531,545 ----
return changed;
}
+ /* Return true when the DECL can possibly be inlined. */
+ bool
+ cgraph_function_possibly_inlined_p (tree decl)
+ {
+ if (!flag_unit_at_a_time)
+ return (DECL_INLINE (decl) && !flag_no_inline);
+ if (!cgraph_global_info_ready)
+ abort ();
+ return cgraph_node (decl)->global.inlined;
+ }
#include "gt-cgraph.h"
Index: cgraph.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraph.h,v
retrieving revision 1.22
diff -c -3 -p -r1.22 cgraph.h
*** cgraph.h 25 Sep 2003 18:11:18 -0000 1.22
--- cgraph.h 21 Oct 2003 14:46:21 -0000
*************** struct cgraph_global_info GTY(())
*** 59,64 ****
--- 59,67 ----
Once we inline all calls to the function and the function is local,
it is set to false. */
bool will_be_output;
+
+ /* Set iff at least one of the caller edges has inline_call flag set. */
+ bool inlined;
};
/* Information about the function that is propagated by the RTL backend.
*************** struct cgraph_varpool_node *cgraph_varpo
*** 167,172 ****
--- 170,177 ----
void cgraph_varpool_mark_needed_node (struct cgraph_varpool_node *);
void cgraph_varpool_finalize_decl (tree);
bool cgraph_varpool_assemble_pending_decls (void);
+
+ bool cgraph_function_possibly_inlined_p (tree);
/* In cgraphunit.c */
bool cgraph_assemble_pending_functions (void);
Index: cgraphunit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cgraphunit.c,v
retrieving revision 1.36
diff -c -3 -p -r1.36 cgraphunit.c
*** cgraphunit.c 20 Oct 2003 21:46:33 -0000 1.36
--- cgraphunit.c 21 Oct 2003 14:46:21 -0000
*************** cgraph_mark_inline (struct cgraph_node *
*** 833,838 ****
--- 833,839 ----
bool called = false;
int new_insns;
+ what->global.inlined = 1;
for (e = what->callers; e; e = e->next_caller)
{
if (e->caller == to)
Index: dwarf2out.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/dwarf2out.c,v
retrieving revision 1.457
diff -c -3 -p -r1.457 dwarf2out.c
*** dwarf2out.c 6 Oct 2003 22:25:15 -0000 1.457
--- dwarf2out.c 21 Oct 2003 14:46:22 -0000
*************** Software Foundation, 59 Temple Place - S
*** 64,69 ****
--- 64,70 ----
#include "target.h"
#include "langhooks.h"
#include "hashtab.h"
+ #include "cgraph.h"
#ifdef DWARF2_DEBUGGING_INFO
static void dwarf2out_source_line (unsigned int, const char *);
*************** gen_subprogram_die (tree decl, dw_die_re
*** 10685,10704 ****
}
else if (DECL_ABSTRACT (decl))
{
! if (DECL_INLINE (decl) && !flag_no_inline)
{
! /* ??? Checking DECL_DEFER_OUTPUT is correct for static
! inline functions, but not for extern inline functions.
! We can't get this completely correct because information
! about whether the function was declared inline is not
! saved anywhere. */
! if (DECL_DEFER_OUTPUT (decl))
add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_declared_inlined);
else
! add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_inlined);
}
else
! add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_declared_not_inlined);
equate_decl_number_to_die (decl, subr_die);
}
--- 10686,10705 ----
}
else if (DECL_ABSTRACT (decl))
{
! if (DECL_DECLARED_INLINE_P (decl))
{
! if (cgraph_function_possibly_inlined_p (decl))
add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_declared_inlined);
else
! add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_declared_not_inlined);
}
else
! {
! if (cgraph_function_possibly_inlined_p (decl))
! add_AT_unsigned (subr_die, DW_AT_inline, DW_INL_inlined);
! else
! abort ();
! }
equate_decl_number_to_die (decl, subr_die);
}
*************** gen_decl_die (tree decl, dw_die_ref cont
*** 11800,11806 ****
/* If we're emitting an out-of-line copy of an inline function,
emit info for the abstract instance and set up to refer to it. */
! else if (DECL_INLINE (decl) && ! DECL_ABSTRACT (decl)
&& ! class_scope_p (context_die)
/* dwarf2out_abstract_function won't emit a die if this is just
a declaration. We must avoid setting DECL_ABSTRACT_ORIGIN in
--- 11801,11808 ----
/* If we're emitting an out-of-line copy of an inline function,
emit info for the abstract instance and set up to refer to it. */
! else if ((cgraph_function_possibly_inlined_p (decl)
! && ! DECL_ABSTRACT (decl)
&& ! class_scope_p (context_die)
/* dwarf2out_abstract_function won't emit a die if this is just
a declaration. We must avoid setting DECL_ABSTRACT_ORIGIN in
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.836
diff -c -3 -p -r1.836 toplev.c
*** toplev.c 20 Oct 2003 21:46:33 -0000 1.836
--- toplev.c 21 Oct 2003 14:46:22 -0000
*************** rest_of_compilation (tree decl)
*** 3177,3183 ****
/* We are now committed to emitting code for this function. Do any
preparation, such as emitting abstract debug info for the inline
before it gets mangled by optimization. */
! if (DECL_INLINE (decl))
(*debug_hooks->outlining_inline_function) (decl);
/* Remove any notes we don't need. That will make iterating
--- 3177,3183 ----
/* We are now committed to emitting code for this function. Do any
preparation, such as emitting abstract debug info for the inline
before it gets mangled by optimization. */
! if (cgraph_function_possibly_inlined_p (decl))
(*debug_hooks->outlining_inline_function) (decl);
/* Remove any notes we don't need. That will make iterating