From: Alexandre Oliva <aoliva@redhat.com>
Date: Fri, 16 Dec 2005 17:27:21 +0000 (+0000)
Subject: jcf-parse.c (set_source_filename): Set the decl source location even when returning... 
X-Git-Tag: releases/gcc-4.2.0~5298
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eefc7734eadc20013f282597a2f653b0a52b1e8;p=thirdparty%2Fgcc.git

jcf-parse.c (set_source_filename): Set the decl source location even when returning early.

* jcf-parse.c (set_source_filename): Set the decl source location
even when returning early.

From-SVN: r108662
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9843b6cbedd7..97e309c2c0bc 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* jcf-parse.c (set_source_filename): Set the decl source location
+	even when returning early.
+
 2005-12-15  Tom Tromey  <tromey@redhat.com>
 	    Andrew Haley  <aph@redhat.com>
 
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 5d22f88d843b..4bc12f4d98a6 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -142,7 +142,13 @@ set_source_filename (JCF *jcf, int index)
 	  && strcmp (sfname, old_filename + old_len - new_len) == 0
 	  && (old_filename[old_len - new_len - 1] == '/'
 	      || old_filename[old_len - new_len - 1] == '\\'))
-	return;
+	{
+#ifndef USE_MAPPED_LOCATION
+	  DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
+	  file_start_location = input_location;
+#endif
+	  return;
+	}
     }
   if (strchr (sfname, '/') == NULL && strchr (sfname, '\\') == NULL)
     {