* stor-layout.c (self_referential_size): Set UNKNOWN_LOCATION on the

	newly built CALL_EXPR.
	* tree-profile.c (tree_profiling): Return 0 for built-in stuff.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160344 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34a2dfcd313d4d45278c74bea4cc5af060ef3c21..86cfe4e832438343fa91e4d4b91414a76babb326 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-06  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * stor-layout.c (self_referential_size): Set UNKNOWN_LOCATION on the
+       newly built CALL_EXPR.
+       * tree-profile.c (tree_profiling): Return 0 for built-in stuff.
+
 2010-06-06  Segher Boessenkool  <segher@kernel.crashing.org>
 
        PR bootstrap/44427

diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index ef9ec596d74eaddf3f9cf8fd008df0e1629e518b..d38a375224a9907f1c96fbe5a4fbcfa425122840 100644 (file)
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -342,7 +342,7 @@ self_referential_size (tree size)
   VEC_safe_push (tree, gc, size_functions, fndecl);
 
   /* Replace the original expression with a call to the size function.  */
-  return build_function_call_expr (input_location, fndecl, arg_list);
+  return build_function_call_expr (UNKNOWN_LOCATION, fndecl, arg_list);
 }
 
 /* Take, queue and compile all the size functions.  It is essential that

diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index ca15001fead20e2f650aa7221f7e389331bab016..127082e1530d8630aca455f31b286e8702ee6392 100644 (file)
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -467,6 +467,10 @@ tree_profiling (void)
       || cfun->after_tree_profile)
     return 0;
 
+  /* Don't profile functions produced for builtin stuff.  */
+  if (DECL_SOURCE_LOCATION (current_function_decl) == BUILTINS_LOCATION)
+    return 0;
+
   /* Re-set global shared temporary variable for edge-counters.  */
   gcov_type_tmp_var = NULL_TREE;