From fe660d7bfe8ae31c03f500af99c1a614438d0198 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Tue, 12 Apr 2011 11:12:58 +0200 Subject: [PATCH] tree-inline.c (tree_function_versioning): Call cgraph_get_node instead of cgraph_node and assert it does not return NULL. 2011-04-12 Martin Jambor * tree-inline.c (tree_function_versioning): Call cgraph_get_node instead of cgraph_node and assert it does not return NULL. * lto-streamer-in.c (lto_read_body): Likewise. * omp-low.c (new_omp_context): Likewise. (create_task_copyfn): Likewise. * tree-emutls.c (lower_emutls_function_body): Likewise. * matrix-reorg.c (transform_allocation_sites): Likewise. From-SVN: r172306 --- gcc/ChangeLog | 10 ++++++++++ gcc/lto-streamer-in.c | 3 ++- gcc/matrix-reorg.c | 6 ++++-- gcc/omp-low.c | 6 ++++-- gcc/tree-emutls.c | 3 ++- gcc/tree-inline.c | 6 ++++-- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3fe9cdb6214..445317d1bef 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2011-04-12 Martin Jambor + + * tree-inline.c (tree_function_versioning): Call cgraph_get_node + instead of cgraph_node and assert it does not return NULL. + * lto-streamer-in.c (lto_read_body): Likewise. + * omp-low.c (new_omp_context): Likewise. + (create_task_copyfn): Likewise. + * tree-emutls.c (lower_emutls_function_body): Likewise. + * matrix-reorg.c (transform_allocation_sites): Likewise. + 2011-04-12 Jakub Jelinek PR c/48552 diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index fc5bc637f38..c95a8e11f95 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -1446,8 +1446,9 @@ lto_read_body (struct lto_file_decl_data *file_data, tree fn_decl, { struct function *fn = DECL_STRUCT_FUNCTION (fn_decl); struct lto_in_decl_state *decl_state; - struct cgraph_node *node = cgraph_node (fn_decl); + struct cgraph_node *node = cgraph_get_node (fn_decl); + gcc_checking_assert (node); push_cfun (fn); init_tree_ssa (fn); diff --git a/gcc/matrix-reorg.c b/gcc/matrix-reorg.c index d2d4fa181c6..44daa27c1f7 100644 --- a/gcc/matrix-reorg.c +++ b/gcc/matrix-reorg.c @@ -2169,7 +2169,8 @@ transform_allocation_sites (void **slot, void *data ATTRIBUTE_UNUSED) update_ssa (TODO_update_ssa); /* Replace the malloc size argument in the malloc of level 0 to be the size of all the dimensions. */ - c_node = cgraph_node (mi->allocation_function_decl); + c_node = cgraph_get_node (mi->allocation_function_decl); + gcc_checking_assert (c_node); old_size_0 = gimple_call_arg (call_stmt_0, 0); tmp = force_gimple_operand_gsi (&gsi, mi->dimension_size[0], true, NULL, true, GSI_SAME_STMT); @@ -2218,7 +2219,8 @@ transform_allocation_sites (void **slot, void *data ATTRIBUTE_UNUSED) if (!mi->free_stmts[i].stmt) continue; - c_node = cgraph_node (mi->free_stmts[i].func); + c_node = cgraph_get_node (mi->free_stmts[i].func); + gcc_checking_assert (c_node); gcc_assert (is_gimple_call (mi->free_stmts[i].stmt)); e = cgraph_edge (c_node, mi->free_stmts[i].stmt); gcc_assert (e); diff --git a/gcc/omp-low.c b/gcc/omp-low.c index c3f217818bc..8b2412cca1a 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1209,7 +1209,8 @@ new_omp_context (gimple stmt, omp_context *outer_ctx) { ctx->cb.src_fn = current_function_decl; ctx->cb.dst_fn = current_function_decl; - ctx->cb.src_node = cgraph_node (current_function_decl); + ctx->cb.src_node = cgraph_get_node (current_function_decl); + gcc_checking_assert (ctx->cb.src_node); ctx->cb.dst_node = ctx->cb.src_node; ctx->cb.src_cfun = cfun; ctx->cb.copy_decl = omp_copy_decl; @@ -6263,7 +6264,8 @@ create_task_copyfn (gimple task_stmt, omp_context *ctx) memset (&tcctx, '\0', sizeof (tcctx)); tcctx.cb.src_fn = ctx->cb.src_fn; tcctx.cb.dst_fn = child_fn; - tcctx.cb.src_node = cgraph_node (tcctx.cb.src_fn); + tcctx.cb.src_node = cgraph_get_node (tcctx.cb.src_fn); + gcc_checking_assert (tcctx.cb.src_node); tcctx.cb.dst_node = tcctx.cb.src_node; tcctx.cb.src_cfun = ctx->cb.src_cfun; tcctx.cb.copy_decl = task_copyfn_copy_decl; diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c index 899888dfb10..cc01fb39438 100644 --- a/gcc/tree-emutls.c +++ b/gcc/tree-emutls.c @@ -619,7 +619,8 @@ lower_emutls_function_body (struct cgraph_node *node) d.cfun_node = node; d.builtin_decl = built_in_decls[BUILT_IN_EMUTLS_GET_ADDRESS]; - d.builtin_node = cgraph_node (d.builtin_decl); + d.builtin_node = cgraph_get_node (d.builtin_decl); + gcc_checking_assert (d.builtin_node); FOR_EACH_BB (d.bb) { diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 9f86204ecff..0ba8e4e84bb 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -5001,8 +5001,10 @@ tree_function_versioning (tree old_decl, tree new_decl, && TREE_CODE (new_decl) == FUNCTION_DECL); DECL_POSSIBLY_INLINED (old_decl) = 1; - old_version_node = cgraph_node (old_decl); - new_version_node = cgraph_node (new_decl); + old_version_node = cgraph_get_node (old_decl); + gcc_checking_assert (old_version_node); + new_version_node = cgraph_get_node (new_decl); + gcc_checking_assert (new_version_node); /* Output the inlining info for this abstract function, since it has been inlined. If we don't do this now, we can lose the information about the -- 2.30.2