Fix documentation typos.

[gcc.git] / gcc / c-pch.c

diff --git a/gcc/c-pch.c b/gcc/c-pch.c
index d8751e83070f43c73675a59c9051831c8a17b8b5..8433f8633dd779036607298d29f970ff06e8ab8f 100644 (file)
--- a/gcc/c-pch.c
+++ b/gcc/c-pch.c
@@ -1,5 +1,6 @@
 /* Precompiled header implementation for the C languages.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -45,7 +46,6 @@ static const struct c_pch_matching
   const char *flag_name;
 } pch_matching[] = {
   { &flag_exceptions, "-fexceptions" },
-  { &flag_unit_at_a_time, "-funit-at-a-time" }
 };
 
 enum {
@@ -93,10 +93,10 @@ static const char *
 get_ident (void)
 {
   static char result[IDENT_LENGTH];
-  static const char template[IDENT_LENGTH] = "gpch.013";
+  static const char templ[] = "gpch.013";
   static const char c_language_chars[] = "Co+O";
 
-  memcpy (result, template, IDENT_LENGTH);
+  memcpy (result, templ, IDENT_LENGTH);
   result[4] = c_language_chars[c_language];
 
   return result;
@@ -113,7 +113,7 @@ pch_init (void)
   FILE *f;
   struct c_pch_validity v;
   void *target_validity;
-  static const char partial_pch[IDENT_LENGTH] = "gpcWrite";
+  static const char partial_pch[] = "gpcWrite";
 
 #ifdef ASM_COMMENT_START
   if (flag_verbose_asm)
@@ -134,6 +134,7 @@ pch_init (void)
 
   gcc_assert (memcmp (executable_checksum, no_checksum, 16) != 0);
 
+  memset (&v, '\0', sizeof (v));
   v.debug_info_type = write_symbols;
   {
     size_t i;
@@ -243,8 +244,9 @@ c_common_valid_pch (cpp_reader *pfile, const char *name, int fd)
     fatal_error ("can%'t read %s: %m", name);
   else if (sizeread != IDENT_LENGTH + 16)
     {
-      cpp_error (pfile, CPP_DL_WARNING, "%s: too short to be a PCH file",
-                name);
+      if (cpp_get_options (pfile)->warn_invalid_pch)
+       cpp_error (pfile, CPP_DL_WARNING, "%s: too short to be a PCH file",
+                  name);
       return 2;
     }
 
@@ -367,11 +369,13 @@ c_common_read_pch (cpp_reader *pfile, const char *name,
   struct c_pch_header h;
   struct save_macro_data *smd;
   expanded_location saved_loc;
+  bool saved_trace_includes;
 
   f = fdopen (fd, "rb");
   if (f == NULL)
     {
       cpp_errno (pfile, CPP_DL_ERROR, "calling fdopen");
+      close (fd);
       return;
     }
 
@@ -380,6 +384,7 @@ c_common_read_pch (cpp_reader *pfile, const char *name,
   if (fread (&h, sizeof (h), 1, f) != 1)
     {
       cpp_errno (pfile, CPP_DL_ERROR, "reading");
+      fclose (f);
       return;
     }
 
@@ -409,26 +414,22 @@ c_common_read_pch (cpp_reader *pfile, const char *name,
     }
 
   /* Save the location and then restore it after reading the PCH.  */
-#ifdef USE_MAPPED_LOCATION
   saved_loc = expand_location (line_table->highest_line);
-#else
-  {
-    const struct line_map *map = linemap_lookup (line_table,
-                                                line_table->highest_line);
-    saved_loc.file = map->to_file;
-    saved_loc.line = SOURCE_LINE (map, line_table->highest_line);
-  }
-#endif
+  saved_trace_includes = line_table->trace_includes;
 
   cpp_prepare_state (pfile, &smd);
 
   gt_pch_restore (f);
 
   if (cpp_read_state (pfile, name, f, smd) != 0)
-    return;
+    {
+      fclose (f);
+      return;
+    }
 
   fclose (f);
 
+  line_table->trace_includes = saved_trace_includes;
   cpp_set_line_map (pfile, line_table);
   linemap_add (line_table, LC_RENAME, 0, saved_loc.file, saved_loc.line);
 
@@ -464,7 +465,7 @@ c_common_pch_pragma (cpp_reader *pfile, const char *name)
   if (!cpp_get_options (pfile)->preprocessed)
     {
       error ("pch_preprocess pragma should only be used with -fpreprocessed");
-      inform ("use #include instead");
+      inform (input_location, "use #include instead");
       return;
     }
 
@@ -475,7 +476,7 @@ c_common_pch_pragma (cpp_reader *pfile, const char *name)
   if (c_common_valid_pch (pfile, name, fd) != 1)
     {
       if (!cpp_get_options (pfile)->warn_invalid_pch)
-       inform ("use -Winvalid-pch for more information");
+       inform (input_location, "use -Winvalid-pch for more information");
       fatal_error ("%s: PCH file was invalid", name);
     }