aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Stump <mrs@apple.com>2003-09-12 05:03:22 +0000
committerPer Bothner <bothner@gcc.gnu.org>2003-09-11 22:03:22 -0700
commit70b160738b3bbebf0af218d785d6223628babc8f (patch)
tree6b26f579c81213f8b3d00f847a602ed6cc2c8040
parent030612a110957f96af1496e1cbf0be58a1cd1359 (diff)
downloadgcc-70b160738b3bbebf0af218d785d6223628babc8f.zip
gcc-70b160738b3bbebf0af218d785d6223628babc8f.tar.gz
gcc-70b160738b3bbebf0af218d785d6223628babc8f.tar.bz2
* c-lex.c (fe_file_change): Don't transform to_line with SOURCE_LINE.
From-SVN: r71328
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/c-lex.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df66b3e..885a40f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-11 Mike Stump <mrs@apple.com>
+
+ * c-lex.c (fe_file_change): Don't transform to_line with SOURCE_LINE.
+
2003-09-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* builtins.c (fold_builtin_logarithm): if N can't be truncated to
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 47515e7..c9c69a6 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -212,8 +212,6 @@ cb_dir_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const char *dir)
void
fe_file_change (const struct line_map *new_map)
{
- unsigned int to_line = SOURCE_LINE (new_map, new_map->to_line);
-
if (new_map->reason == LC_ENTER)
{
/* Don't stack the main buffer on the input stack;
@@ -250,13 +248,13 @@ fe_file_change (const struct line_map *new_map)
#endif
pop_srcloc ();
- (*debug_hooks->end_source_file) (to_line);
+ (*debug_hooks->end_source_file) (new_map->to_line);
}
update_header_times (new_map->to_file);
in_system_header = new_map->sysp != 0;
input_filename = new_map->to_file;
- input_line = to_line;
+ input_line = new_map->to_line;
map = new_map;
/* Hook for C++. */