diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-10-03 21:28:09 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-10-03 21:28:09 +0200 |
| commit | 32001f69b9db91182b382495c41c316bedb7e5cc (patch) | |
| tree | 0030be35865c335cfb3fd28ce1162acf7dcfee23 | |
| parent | 524d9a4532011e74366a8aa3549e4322ee2d75e2 (diff) | |
| download | gcc-32001f69b9db91182b382495c41c316bedb7e5cc.zip gcc-32001f69b9db91182b382495c41c316bedb7e5cc.tar.gz gcc-32001f69b9db91182b382495c41c316bedb7e5cc.tar.bz2 | |
gimplify.c (gimplify_function_tree): For -finstrument-functions use gimple_bind_{,set_}block instead of...
* gimplify.c (gimplify_function_tree): For -finstrument-functions
use gimple_bind_{,set_}block instead of gimple_{,set_}block.
* gimple.h (gimple_bind_set_block): Allow second argument to be NULL.
From-SVN: r140858
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/gimple.h | 2 | ||||
| -rw-r--r-- | gcc/gimplify.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9649993..5c47713 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2008-10-03 Jakub Jelinek <jakub@redhat.com> + * gimplify.c (gimplify_function_tree): For -finstrument-functions + use gimple_bind_{,set_}block instead of gimple_{,set_}block. + * gimple.h (gimple_bind_set_block): Allow second argument to be NULL. + PR debug/37726 * gimplify.c (declare_vars): Use gimple_bind_block instead of gimple_block. diff --git a/gcc/gimple.h b/gcc/gimple.h index a390590..a6947c3 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -2602,7 +2602,7 @@ static inline void gimple_bind_set_block (gimple gs, tree block) { GIMPLE_CHECK (gs, GIMPLE_BIND); - gcc_assert (TREE_CODE (block) == BLOCK); + gcc_assert (block == NULL_TREE || TREE_CODE (block) == BLOCK); gs->gimple_bind.block = block; } diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5123efd..2befb43 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7366,10 +7366,10 @@ gimplify_function_tree (tree fndecl) x = implicit_built_in_decls[BUILT_IN_PROFILE_FUNC_ENTER]; gimplify_seq_add_stmt (&body, gimple_build_call (x, 0)); gimplify_seq_add_stmt (&body, tf); - new_bind = gimple_build_bind (NULL, body, gimple_block (bind)); + new_bind = gimple_build_bind (NULL, body, gimple_bind_block (bind)); /* Clear the block for BIND, since it is no longer directly inside the function, but within a try block. */ - gimple_set_block (bind, NULL); + gimple_bind_set_block (bind, NULL); /* Replace the current function body with the body wrapped in the try/finally TF. */ |