* decl.c (finish_function): Use SET_EXPR_LOCATION instead of

	unavailable annotate_with_file_line, if USE_MAPPED_LOCATION.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 51cc4f1bffe42b2cc14b829f0dcc370b33707a13..55ec85461c33e5a6e1cf6a02f4f596b97c7be6c2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-01  Per Bothner  <per@bothner.com>
+
+       * decl.c (finish_function): Use SET_EXPR_LOCATION instead of
+       unavailable annotate_with_file_line, if USE_MAPPED_LOCATION.
+
 2005-03-01  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/20232

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 072519ca1ed4210b9bb1c5ac10a2bc7635b89ae6..bfe503f30d3820933482095a10ef67aff83bfd8b 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10593,7 +10593,11 @@ finish_function (int flags)
          /* Hack.  We don't want the middle-end to warn that this
             return is unreachable, so put the statement on the
             special line 0.  */
+#ifdef USE_MAPPED_LOCATION
+         SET_EXPR_LOCATION (stmt, UNKNOWN_LOCATION);
+#else
          annotate_with_file_line (stmt, input_filename, 0);
+#endif
        }
 
       /* Finish dealing with exception specifiers.  */