diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a199711ffa..1bdeb2ef39f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-22  Jan Hubicka  <jh@suse.cz>
+
+	* function.c (allocate_struct_function): Do not initialize expr, emit
+	and varasm.
+	(prepare_function_start): Do it here.
+	* c-parse.in (maybe_type_qual): Do not produce line number notes.
+
 2004-01-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR target/13559
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 4cdbfed8b0c..3804ea5460b 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -2504,10 +2504,9 @@ label:	  CASE expr_no_commas ':'
 
 maybe_type_qual:
 	/* empty */
-		{ emit_line_note (input_location);
-		  $$ = NULL_TREE; }
+		{ $$ = NULL_TREE; }
 	| TYPE_QUAL
-		{ emit_line_note (input_location); }
+		{ }
 	;
 
 xexpr:
diff --git a/gcc/function.c b/gcc/function.c
index 2b710b42aba..2cdcdd33e36 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -6394,9 +6394,6 @@ allocate_struct_function (tree fndecl)
 
   init_stmt_for_function ();
   init_eh_for_function ();
-  init_emit ();
-  init_expr ();
-  init_varasm_status (cfun);
 
   (*lang_hooks.function.init) (cfun);
   if (init_machine_status)
@@ -6434,6 +6431,9 @@ prepare_function_start (tree fndecl)
     cfun = DECL_SAVED_INSNS (fndecl);
   else
     allocate_struct_function (fndecl);
+  init_emit ();
+  init_varasm_status (cfun);
+  init_expr ();
 
   cse_not_expected = ! optimize;