diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0f92a345fa..a24bbad0cf3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,10 @@
+2003-12-22  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* c-decl.c (finish_function): Change order of checks.
+	(c_expand_body): Likewise.
+
 2003-12-22  Fariborz Jahanian <fjahanian@apple.com>
+
         * config/rs6000/rs6000.c (legitimate_offset_address_p): Correct
         check for the legitimate offset when memory of 
 	DImode/DFmode/TFmode/TImode mode is being referenced and target 
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 65e7176770e..db04a877f1a 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -6088,12 +6088,12 @@ finish_function (void)
  	}
     }
 
-  if (DECL_INITIAL (fndecl) != error_mark_node && DECL_INITIAL (fndecl))
+  if (DECL_INITIAL (fndecl) && DECL_INITIAL (fndecl) != error_mark_node)
     BLOCK_SUPERCONTEXT (DECL_INITIAL (fndecl)) = fndecl;
 
   /* Must mark the RESULT_DECL as being in this function.  */
 
-  if (DECL_RESULT (fndecl) != error_mark_node && DECL_RESULT (fndecl))
+  if (DECL_RESULT (fndecl) && DECL_RESULT (fndecl) != error_mark_node)
     DECL_CONTEXT (DECL_RESULT (fndecl)) = fndecl;
 
   if (MAIN_NAME_P (DECL_NAME (fndecl)) && flag_hosted)
@@ -6226,7 +6226,7 @@ void
 c_expand_body (tree fndecl)
 {
 
-  if (DECL_INITIAL (fndecl) != error_mark_node && DECL_INITIAL (fndecl))
+  if (DECL_INITIAL (fndecl) && DECL_INITIAL (fndecl) != error_mark_node)
     c_expand_body_1 (fndecl, 0);
 }