From ef6179d186ee9a2ebe034d328a17764e703273ca Mon Sep 17 00:00:00 2001 From: Dehao Chen Date: Tue, 8 Oct 2013 08:34:28 +0000 Subject: [PATCH] re PR tree-optimization/58619 (ICE building in gen_combined_adhoc_loc) PR tree-optimization/58619 2013-10-08 Dehao Chen * tree-inline.c (copy_phis_for_bb): Combine location data only if non-null. From-SVN: r203269 --- gcc/ChangeLog | 6 ++++++ gcc/tree-inline.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 500fcbb0e5d6..80343b91d8ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-10-08 Dehao Chen + + PR tree-optimization/58619 + * tree-inline.c (copy_phis_for_bb): Combine location data + only if non-null. + 2013-10-08 Zhenqiang Chen PR target/58423 diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index ebb4b9188133..ef8eba473a22 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -2090,7 +2090,10 @@ copy_phis_for_bb (basic_block bb, copy_body_data *id) n = (tree *) pointer_map_contains (id->decl_map, LOCATION_BLOCK (locus)); gcc_assert (n); - locus = COMBINE_LOCATION_DATA (line_table, locus, *n); + if (*n) + locus = COMBINE_LOCATION_DATA (line_table, locus, *n); + else + locus = LOCATION_LOCUS (locus); } else locus = LOCATION_LOCUS (locus); -- 2.47.2