This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[tree-ssa] Fix c-parse.in merge problem
- From: Diego Novillo <dnovillo at redhat dot com>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Date: 03 Jun 2003 13:28:46 -0400
- Subject: [tree-ssa] Fix c-parse.in merge problem
- Organization: Red Hat Canada
c-parse.y is a generated file. c-parse.y is a generated file.
c-parse.y is a generated file.
Sigh.
Diego.
* c-parse.in: Fix botched merge.
Index: c-parse.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-parse.in,v
retrieving revision 1.144.2.13
retrieving revision 1.144.2.14
diff -d -u -p -r1.144.2.13 -r1.144.2.14
--- c-parse.in 3 Jun 2003 16:50:30 -0000 1.144.2.13
+++ c-parse.in 3 Jun 2003 17:24:18 -0000 1.144.2.14
@@ -1592,8 +1592,7 @@ nested_function:
}
old_style_parm_decls save_filename save_lineno
{ tree decl = current_function_decl;
- DECL_SOURCE_FILE (decl) = $4;
- DECL_SOURCE_LINE (decl) = $5;
+ annotate_with_file_line (decl, $4, $5);
store_parm_decls (); }
/* This used to use compstmt_or_error.
That caused a bug with input `f(g) int g {}',
@@ -1624,8 +1623,7 @@ notype_nested_function:
}
old_style_parm_decls save_filename save_lineno
{ tree decl = current_function_decl;
- DECL_SOURCE_FILE (decl) = $4;
- DECL_SOURCE_LINE (decl) = $5;
+ annotate_with_file_line (decl, $4, $5);
store_parm_decls (); }
/* This used to use compstmt_or_error.
That caused a bug with input `f(g) int g {}',