diff options
| author | Richard Biener <rguenther@suse.de> | 2018-09-28 11:33:29 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2018-09-28 11:33:29 +0000 |
| commit | dc16b00717f72aae2d93865a8007ff220b6f022f (patch) | |
| tree | ccfb814b58f42d2c18830a1f2b72031aeede8e48 /gcc/auto-profile.c | |
| parent | 2bd4ca7ad508ec9b94f8c3442a6e39d5276d7915 (diff) | |
| download | gcc-dc16b00717f72aae2d93865a8007ff220b6f022f.zip gcc-dc16b00717f72aae2d93865a8007ff220b6f022f.tar.gz gcc-dc16b00717f72aae2d93865a8007ff220b6f022f.tar.bz2 | |
tree.h (BLOCK_ORIGIN): New.
2018-09-28 Richard Biener <rguenther@suse.de>
* tree.h (BLOCK_ORIGIN): New.
* omp-expand.c (grid_expand_target_grid_body): Assign
BLOCK_ORIGIN to BLOCK_ABSTRACT_ORIGIN.
* tree-inline.c (remap_block): Likewise.
* auto-profile.c (get_function_decl_from_block): Simplify
by eliding the BLOCK_ABSTRACT_ORIGIN chasing.
* langhooks.c (lhd_print_error_function): Likewise.
* optinfo-emit-json.cc (optrecord_json_writer::inlining_chain_to):
Likewise.
* tree-ssa-live.c (remove_unused_scope_block_p): Likewise.
* tree.c (block_nonartificial_location): Likewise.
(block_ultimate_origin): Likewise.
* tree-pretty-print.c (percent_K_format): Likewise. Remove
no longer needed LTO case.
cp/
* error.c (cp_print_error_function): Simplify by eliding
the BLOCK_ABSTRACT_ORIGIN chasing.
From-SVN: r264689
Diffstat (limited to 'gcc/auto-profile.c')
| -rw-r--r-- | gcc/auto-profile.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c index 68abe32..f7ba32c 100644 --- a/gcc/auto-profile.c +++ b/gcc/auto-profile.c @@ -354,17 +354,10 @@ get_combined_location (location_t loc, tree decl) static tree get_function_decl_from_block (tree block) { - tree decl; - - if (LOCATION_LOCUS (BLOCK_SOURCE_LOCATION (block)) == UNKNOWN_LOCATION) + if (!inlined_function_outer_scope_p (block)) return NULL_TREE; - for (decl = BLOCK_ABSTRACT_ORIGIN (block); - decl && (TREE_CODE (decl) == BLOCK); - decl = BLOCK_ABSTRACT_ORIGIN (decl)) - if (TREE_CODE (decl) == FUNCTION_DECL) - break; - return decl; + return BLOCK_ABSTRACT_ORIGIN (block); } /* Store inline stack for STMT in STACK. */ |