From 2eefc7734eadc20013f282597a2f653b0a52b1e8 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 16 Dec 2005 17:27:21 +0000 Subject: [PATCH] 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 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-parse.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) 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 + + * jcf-parse.c (set_source_filename): Set the decl source location + even when returning early. + 2005-12-15 Tom Tromey Andrew Haley 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) { -- 2.7.4