From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Tue, 18 Mar 2003 00:05:29 +0000 (+0000)
Subject: Backport:
X-Git-Tag: releases/gcc-3.2.3~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f079a3c87e8b458b8e426ac33fc36f255b8fcb1;p=thirdparty%2Fgcc.git

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 5806fab08bd6..029da63194e9 100644
--- 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 0e21cdf8d1e0..eb4d38678188 100644
--- 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);
     }