Backport:

	2002-12-05  Ranjit Mathew <rmathew@hotmail.com>
	            Andrew Haley <aph@redhat.com>

	* parse.y (source_end_java_method): Remove custom encoding of line
	numbers for a function decl before passing it to the back end.

From-SVN: r64510

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5806fab08bd6879117bc881806a17c5853fd80e2..029da63194e96d3314c02c81a5bfa486ce6f31a6 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       Backport:
+       2002-12-05  Ranjit Mathew <rmathew@hotmail.com>
+                   Andrew Haley <aph@redhat.com>
+
+       * parse.y (source_end_java_method): Remove custom encoding of line
+       numbers for a function decl before passing it to the back end.
+
 2003-02-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        * gcj.texi: Bump version.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 0e21cdf8d1e06de83872d3961c3811b0f5164672..eb4d38678188b19616fc9d99174fc01165342709 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -7473,6 +7473,8 @@ source_end_java_method ()
       lineno = DECL_SOURCE_LINE_LAST (fndecl);
       expand_function_end (input_filename, lineno, 0);
 
+      DECL_SOURCE_LINE (fndecl) = DECL_SOURCE_LINE_FIRST (fndecl);
+
       /* Run the optimizers and output assembler code for this function. */
       rest_of_compilation (fndecl);
     }