tree-inline.c (expand_call_inline): Do not associate a BLOCK with the location…

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

gcc/ChangeLog

 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.

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

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