diff options
| author | Richard Biener <rguenther@suse.de> | 2013-03-08 11:29:06 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2013-03-08 11:29:06 +0000 |
| commit | a9d5a059c39bec69da52ec8e08be5653fc57875c (patch) | |
| tree | 4491ef3341d0f40be0dc705c5a8ca5c4a2d69ca8 | |
| parent | 69bb863a1f5a3ffad2f9504708ee1e37be2e50d3 (diff) | |
| download | gcc-a9d5a059c39bec69da52ec8e08be5653fc57875c.zip gcc-a9d5a059c39bec69da52ec8e08be5653fc57875c.tar.gz gcc-a9d5a059c39bec69da52ec8e08be5653fc57875c.tar.bz2 | |
tree-inline.c (expand_call_inline): Do not associate a BLOCK with the location in BLOCK_SOURCE_LOCATION.
2013-03-08 Richard Biener <rguenther@suse.de>
* tree-inline.c (expand_call_inline): Do not associate
a BLOCK with the location in BLOCK_SOURCE_LOCATION.
* tree-cfg.c (verify_location): Verify BLOCK_SOURCE_LOCATION.
From-SVN: r196542
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 2 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c44b13b..4002376 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2013-03-08 Richard Biener <rguenther@suse.de> + * tree-inline.c (expand_call_inline): Do not associate + a BLOCK with the location in BLOCK_SOURCE_LOCATION. + * tree-cfg.c (verify_location): Verify BLOCK_SOURCE_LOCATION. + +2013-03-08 Richard Biener <rguenther@suse.de> + * tree-ssa-ter.c (is_replaceable_p): Do not TER across location or block changes with -Og. Fix for location / block encoding changes and PHI arguments with locations. diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 83003fb..7be44e4 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -4511,6 +4511,8 @@ verify_location (pointer_set_t *blocks, location_t loc) error ("location references block not in block tree"); return true; } + if (block != NULL_TREE) + return verify_location (blocks, BLOCK_SOURCE_LOCATION (block)); return false; } diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 714bcf0..5121765 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3929,7 +3929,7 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id) { id->block = make_node (BLOCK); BLOCK_ABSTRACT_ORIGIN (id->block) = fn; - BLOCK_SOURCE_LOCATION (id->block) = input_location; + BLOCK_SOURCE_LOCATION (id->block) = LOCATION_LOCUS (input_location); prepend_lexical_block (gimple_block (stmt), id->block); } |