aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2005-12-16 17:27:21 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2005-12-16 17:27:21 +0000
commit2eefc7734eadc20013f282597a2f653b0a52b1e8 (patch)
tree09edcb6a6c8df76b9cd826c9f51d1a326d73c98b /gcc
parentcb1783951e19900aa6ded1ecec45b47b682b98e1 (diff)
downloadgcc-2eefc7734eadc20013f282597a2f653b0a52b1e8.zip
gcc-2eefc7734eadc20013f282597a2f653b0a52b1e8.tar.gz
gcc-2eefc7734eadc20013f282597a2f653b0a52b1e8.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jcf-parse.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9843b6c..97e309c 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 5d22f88..4bc12f4 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)
{