From: Dehao Chen <dehao@google.com>
Date: Tue, 8 Oct 2013 08:34:28 +0000 (+0000)
Subject: re PR tree-optimization/58619 (ICE building in gen_combined_adhoc_loc)
X-Git-Tag: releases/gcc-4.9.0~3685
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef6179d186ee9a2ebe034d328a17764e703273ca;p=thirdparty%2Fgcc.git

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

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