On Thu, Mar 08, 2012 at 12:06:46PM +0100, Martin Jambor wrote: > /* For local statics lookup proper context die. */ > - if (TREE_STATIC (decl) && decl_function_context (decl)) > - context_die = lookup_decl_die (DECL_CONTEXT (decl)); > + if (TREE_STATIC (decl) && > + (ctx_fndecl = decl_function_context (decl)) != NULL_TREE) > + context_die = lookup_decl_die (ctx_fndecl);
The formatting is wrong, && shouldn't be at the end of line. For the rest I'll defer to Jason, not sure what exactly we want to do there. This hunk has been added by Honza: 2005-06-09 Jan Hubicka <j...@suse.cz> * cgraphunit.c (cgraph_create_edges): Do not walk BLOCK; finalize local statics when doing unit-at-a-time. (cgraph_varpool_assemble_pending_decls): Output debug info. * dwarf2out.c (decls_for_scope): Skip local statics. (dwarf2out_decl): Handle local statics. * passes.c (rest_of_decl_compilation): Do not differentiate local and global statics in unit-at-a-time. * tree-inline.c (remap_decls): Put local static into unexpanded_vars_list rather than introducing duplicated VAR_DECL node. Jakub