re PR tree-optimization/58619 (ICE building in gen_combined_adhoc_loc)

PR tree-optimization/58619

2013-10-08  Dehao Chen  <dehao@google.com>

	* tree-inline.c (copy_phis_for_bb): Combine location data
	only if non-null.

From-SVN: r203269

gcc/ChangeLog

+2013-10-08  Dehao Chen  <dehao@google.com>
+
+	PR tree-optimization/58619
+	* tree-inline.c (copy_phis_for_bb): Combine location data
+	only if non-null.
+
 2013-10-08  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
 
 	PR target/58423

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);