From 9f9ebcdfc635e94463350898b625e0f3b1431ec0 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Mon, 11 Apr 2011 17:17:44 +0200 Subject: cgraph.c (cgraph_local_info): Call cgraph_get_node instead of cgraph_node, handle NULL return value. 2011-04-11 Martin Jambor gcc/ * cgraph.c (cgraph_local_info): Call cgraph_get_node instead of cgraph_node, handle NULL return value. (cgraph_global_info): Likewise. (cgraph_rtl_info): Likewise. * tree-inline.c (estimate_num_insns): Likewise. * gimplify.c (unshare_body): Likewise. (unvisit_body): Likewise. (gimplify_body): Likewise. * predict.c (optimize_function_for_size_p): Likewise. * tree-ssa-alias.c (ref_maybe_used_by_call_p_1): Likewise. (call_may_clobber_ref_p_1): Likewise. * varasm.c (function_section_1): Likewise. (assemble_start_function): Likewise. gcc/java/ * decl.c (java_mark_decl_local): Call cgraph_get_node instead of cgraph_node and handle returned NULL. From-SVN: r172258 --- gcc/java/ChangeLog | 5 +++++ gcc/java/decl.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 61b2418..3f81762 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2011-04-11 Martin Jambor + + * decl.c (java_mark_decl_local): Call cgraph_get_node instead of + cgraph_node and handle returned NULL. + 2011-03-25 Kai Tietz * jcf-parse.c (java_read_sourcefilenames): Use filename_cmp diff --git a/gcc/java/decl.c b/gcc/java/decl.c index a17b826..75f44c9 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1928,7 +1928,10 @@ java_mark_decl_local (tree decl) #ifdef ENABLE_CHECKING /* Double check that we didn't pass the function to the callgraph early. */ if (TREE_CODE (decl) == FUNCTION_DECL) - gcc_assert (!cgraph_node (decl)->local.finalized); + { + struct cgraph_node *node = cgraph_get_node (decl); + gcc_assert (!node || !node->local.finalized); + } #endif gcc_assert (!DECL_RTL_SET_P (decl)); } -- cgit v1.1