From 9ca88bbdada6f39aa12dec30e32d57535581dba4 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 3 Apr 2007 13:14:16 +0000 Subject: [PATCH] 4.1.2-8 --- gcc41-java-bogus-debugline.patch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gcc41-java-bogus-debugline.patch b/gcc41-java-bogus-debugline.patch index 469d7e1..34c4af3 100644 --- a/gcc41-java-bogus-debugline.patch +++ b/gcc41-java-bogus-debugline.patch @@ -1,9 +1,11 @@ 2007-03-16 Andrew Haley * class.c (push_class): Don't bogusly guess the source filename. + * jcf-parse.c (give_name_to_class): Don't set input_location from + DECL_ARTIFICIAL decls. ---- gcc/java/class.c (revision 122746) -+++ gcc/java/class.c (working copy) +--- gcc/java/class.c (revision 122746) ++++ gcc/java/class.c (working copy) @@ -426,8 +426,7 @@ tree decl, signature; location_t saved_loc = input_location; @@ -14,3 +16,22 @@ input_line = 0; #endif CLASS_P (class_type) = 1; +--- gcc/java/jcf-parse.c (revision 122746) ++++ gcc/java/jcf-parse.c (working copy) +@@ -1221,9 +1221,12 @@ + main_input_filename = sfname; + } + #else +- input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class)); +- if (main_input_filename == NULL && jcf == main_jcf) +- main_input_filename = input_filename; ++ if (! DECL_ARTIFICIAL (TYPE_NAME (this_class))) ++ { ++ input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class)); ++ if (main_input_filename == NULL && jcf == main_jcf) ++ main_input_filename = input_filename; ++ } + #endif + + jcf->cpool.data[i].t = this_class; +