[multiple changes]
2004-01-15 Geoffrey Keating <geoffk@apple.com> * Makefile.in (MD5_H): New. (fold-const.o): Depend on md5.h. (dwarf2out.o): Likewise. (cppfiles.o): Likewise. * cppfiles.c: Include md5.h. (should_stack_file): Check against list read from PCH file. (struct pchf_data): New. (pchf): New variable. (struct pchf_adder_info): New. (pchf_adder): New. (pchf_save_compare): New. (_cpp_save_file_entries): New. (_cpp_read_file_entries): New. (struct pchf_compare_data): New. (pchf_compare): New. (check_file_against_entries): New. * cpphash.h (_cpp_save_file_entries): Prototype. (_cpp_read_file_entries): Prototype. * cpppch.c (cpp_write_pch_state): Write the list of headers. (cpp_read_state): Read the list of headers. Index: testsuite/ChangeLog 2004-01-16 Geoffrey Keating <geoffk@apple.com> * gcc.dg/pch/import-1.c: New. * gcc.dg/pch/import-1.hs: New. * gcc.dg/pch/import-1a.h: New. * gcc.dg/pch/import-1b.h: New. * gcc.dg/pch/import-1c.h: New. From-SVN: r76016
This commit is contained in:
parent
790b6144d1
commit
73e61092e1
11 changed files with 328 additions and 11 deletions
|
@ -1,3 +1,26 @@
|
|||
2004-01-16 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* Makefile.in (MD5_H): New.
|
||||
(fold-const.o): Depend on md5.h.
|
||||
(dwarf2out.o): Likewise.
|
||||
(cppfiles.o): Likewise.
|
||||
* cppfiles.c: Include md5.h.
|
||||
(should_stack_file): Check against list read from PCH file.
|
||||
(struct pchf_data): New.
|
||||
(pchf): New variable.
|
||||
(struct pchf_adder_info): New.
|
||||
(pchf_adder): New.
|
||||
(pchf_save_compare): New.
|
||||
(_cpp_save_file_entries): New.
|
||||
(_cpp_read_file_entries): New.
|
||||
(struct pchf_compare_data): New.
|
||||
(pchf_compare): New.
|
||||
(check_file_against_entries): New.
|
||||
* cpphash.h (_cpp_save_file_entries): Prototype.
|
||||
(_cpp_read_file_entries): Prototype.
|
||||
* cpppch.c (cpp_write_pch_state): Write the list of headers.
|
||||
(cpp_read_state): Read the list of headers.
|
||||
|
||||
2004-01-17 Jan Hubicka <jh@suse.cz>
|
||||
|
||||
* c-common.c (c_estimate_num_insns_1): Handle builtin_constant_p and
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Run 'configure' to generate Makefile from Makefile.in
|
||||
|
||||
# Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
|
||||
# 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
# 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
#This file is part of GCC.
|
||||
|
||||
|
@ -340,6 +340,7 @@ OBSTACK_H = $(srcdir)/../include/obstack.h
|
|||
SPLAY_TREE_H= $(srcdir)/../include/splay-tree.h
|
||||
FIBHEAP_H = $(srcdir)/../include/fibheap.h
|
||||
PARTITION_H = $(srcdir)/../include/partition.h
|
||||
MD5_H = $(srcdir)/../include/md5.h
|
||||
|
||||
# Default native SYSTEM_HEADER_DIR, to be overridden by targets.
|
||||
NATIVE_SYSTEM_HEADER_DIR = /usr/include
|
||||
|
@ -1502,8 +1503,9 @@ print-tree.o : print-tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H
|
|||
stor-layout.o : stor-layout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
|
||||
flags.h function.h $(EXPR_H) $(RTL_H) toplev.h $(GGC_H) $(TM_P_H) $(TARGET_H) \
|
||||
langhooks.h
|
||||
fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
|
||||
flags.h real.h toplev.h $(HASHTAB_H) $(EXPR_H) $(RTL_H) $(GGC_H) $(TM_P_H) langhooks.h
|
||||
fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
|
||||
$(TREE_H) flags.h real.h toplev.h $(HASHTAB_H) $(EXPR_H) $(RTL_H) $(GGC_H) \
|
||||
$(TM_P_H) langhooks.h $(MD5_H)
|
||||
diagnostic.o : diagnostic.c $(DIAGNOSTIC_H) real.h \
|
||||
$(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(TM_P_H) flags.h $(GGC_H) \
|
||||
input.h toplev.h intl.h langhooks.h $(LANGHOOKS_DEF_H)
|
||||
|
@ -1596,11 +1598,12 @@ sdbout.o : sdbout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_
|
|||
flags.h function.h $(EXPR_H) output.h hard-reg-set.h $(REGS_H) real.h \
|
||||
insn-config.h xcoffout.h c-pragma.h $(GGC_H) $(TARGET_H) \
|
||||
sdbout.h toplev.h $(TM_P_H) except.h debug.h langhooks.h gt-sdbout.h
|
||||
dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
|
||||
$(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h output.h $(DIAGNOSTIC_H) real.h \
|
||||
hard-reg-set.h $(REGS_H) $(EXPR_H) libfuncs.h toplev.h dwarf2out.h varray.h \
|
||||
$(GGC_H) except.h dwarf2asm.h $(TM_P_H) langhooks.h $(HASHTAB_H) \
|
||||
gt-dwarf2out.h $(TARGET_H) cgraph.h
|
||||
dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
|
||||
$(TREE_H) $(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h \
|
||||
output.h $(DIAGNOSTIC_H) real.h hard-reg-set.h $(REGS_H) $(EXPR_H) \
|
||||
libfuncs.h toplev.h dwarf2out.h varray.h $(GGC_H) except.h dwarf2asm.h \
|
||||
$(TM_P_H) langhooks.h $(HASHTAB_H) gt-dwarf2out.h $(TARGET_H) cgraph.h \
|
||||
$(MD5_H)
|
||||
dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) flags.h $(RTL_H) \
|
||||
$(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
|
||||
vmsdbgout.o : vmsdbgout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
|
||||
|
@ -2342,7 +2345,7 @@ cppmacro.o: cppmacro.c $(LIBCPP_DEPS)
|
|||
cpplib.o: cpplib.c $(LIBCPP_DEPS)
|
||||
cpphash.o: cpphash.c $(LIBCPP_DEPS)
|
||||
cpptrad.o: cpptrad.c $(LIBCPP_DEPS)
|
||||
cppfiles.o: cppfiles.c $(LIBCPP_DEPS) $(HASHTAB_H) mkdeps.h
|
||||
cppfiles.o: cppfiles.c $(LIBCPP_DEPS) $(HASHTAB_H) $(MD5_H) mkdeps.h
|
||||
cppinit.o: cppinit.c $(LIBCPP_DEPS) mkdeps.h
|
||||
cpppch.o: cpppch.c $(LIBCPP_DEPS) mkdeps.h
|
||||
|
||||
|
|
233
gcc/cppfiles.c
233
gcc/cppfiles.c
|
@ -1,6 +1,6 @@
|
|||
/* Part of CPP library. File handling.
|
||||
Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1998,
|
||||
1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
Written by Per Bothner, 1994.
|
||||
Based on CCCP program by Paul Rubin, June 1986
|
||||
Adapted to ANSI C, Richard Stallman, Jan 1987
|
||||
|
@ -28,6 +28,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|||
#include "intl.h"
|
||||
#include "mkdeps.h"
|
||||
#include "hashtab.h"
|
||||
#include "md5.h"
|
||||
#include <dirent.h>
|
||||
|
||||
/* Variable length record files on VMS will have a stat size that includes
|
||||
|
@ -180,6 +181,10 @@ static char *remap_filename (cpp_reader *pfile, _cpp_file *file);
|
|||
static char *append_file_to_dir (const char *fname, cpp_dir *dir);
|
||||
static bool validate_pch (cpp_reader *, _cpp_file *file, const char *pchname);
|
||||
static bool include_pch_p (_cpp_file *file);
|
||||
static int pchf_adder (void **slot, void *data);
|
||||
static int pchf_save_compare (const void *e1, const void *e2);
|
||||
static int pchf_compare (const void *d_p, const void *e_p);
|
||||
static bool check_file_against_entries (cpp_reader *, _cpp_file *, bool);
|
||||
|
||||
/* Given a filename in FILE->PATH, with the empty string interpreted
|
||||
as <stdin>, open it.
|
||||
|
@ -590,6 +595,19 @@ should_stack_file (cpp_reader *pfile, _cpp_file *file, bool import)
|
|||
if (!read_file (pfile, file))
|
||||
return false;
|
||||
|
||||
/* Check the file against the PCH file. This is done before
|
||||
checking against files we've already seen, since it may save on
|
||||
I/O. */
|
||||
if (check_file_against_entries (pfile, file, import))
|
||||
{
|
||||
/* If this isn't a #import, but yet we can't include the file,
|
||||
that means that it was #import-ed in the PCH file,
|
||||
so we can never include it again. */
|
||||
if (! import)
|
||||
_cpp_mark_file_once_only (pfile, file);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Now we've read the file's contents, we can stack it if there
|
||||
are no once-only files. */
|
||||
if (!pfile->seen_once_only)
|
||||
|
@ -1249,3 +1267,216 @@ validate_pch (cpp_reader *pfile, _cpp_file *file, const char *pchname)
|
|||
file->path = saved_path;
|
||||
return valid;
|
||||
}
|
||||
|
||||
/* This datastructure holds the list of header files that were seen
|
||||
while the PCH was being built. The 'entries' field is kept sorted
|
||||
in memcmp() order; yes, this means that on little-endian systems,
|
||||
it's sorted initially by the least-significant byte of 'size', but
|
||||
that's OK. The code does rely on having entries with the same size
|
||||
next to each other. */
|
||||
|
||||
struct pchf_data {
|
||||
/* Number of pchf_entry structures. */
|
||||
size_t count;
|
||||
|
||||
/* Are there any values with once_only set?
|
||||
This is used as an optimisation, it means we don't have to search
|
||||
the structure if we're processing a regular #include. */
|
||||
bool have_once_only;
|
||||
|
||||
struct pchf_entry {
|
||||
/* The size of this file. This is used to save running a MD5 checksum
|
||||
if the sizes don't match. */
|
||||
off_t size;
|
||||
/* The MD5 checksum of this file. */
|
||||
unsigned char sum[16];
|
||||
/* Is this file to be included only once? */
|
||||
bool once_only;
|
||||
} entries[1];
|
||||
};
|
||||
|
||||
static struct pchf_data *pchf;
|
||||
|
||||
/* Data for pchf_addr. */
|
||||
struct pchf_adder_info
|
||||
{
|
||||
cpp_reader *pfile;
|
||||
struct pchf_data *d;
|
||||
};
|
||||
|
||||
/* A hash traversal function to add entries into DATA->D. */
|
||||
|
||||
static int
|
||||
pchf_adder (void **slot, void *data)
|
||||
{
|
||||
struct file_hash_entry *h = (struct file_hash_entry *) *slot;
|
||||
struct pchf_adder_info *i = (struct pchf_adder_info *) data;
|
||||
|
||||
if (h->start_dir != NULL && h->u.file->stack_count != 0)
|
||||
{
|
||||
struct pchf_data *d = i->d;
|
||||
_cpp_file *f = h->u.file;
|
||||
size_t count = d->count++;
|
||||
|
||||
/* This should probably never happen, since if a read error occurred
|
||||
the PCH file shouldn't be written... */
|
||||
if (f->dont_read || f->err_no)
|
||||
return 1;
|
||||
|
||||
d->entries[count].once_only = f->once_only;
|
||||
d->have_once_only |= f->once_only;
|
||||
if (f->buffer_valid)
|
||||
md5_buffer ((const char *)f->buffer,
|
||||
f->st.st_size, d->entries[count].sum);
|
||||
else
|
||||
{
|
||||
FILE *ff;
|
||||
int oldfd = f->fd;
|
||||
|
||||
if (!open_file (f))
|
||||
{
|
||||
open_file_failed (i->pfile, f);
|
||||
return 0;
|
||||
}
|
||||
ff = fdopen (f->fd, "rb");
|
||||
md5_stream (ff, d->entries[count].sum);
|
||||
fclose (ff);
|
||||
f->fd = oldfd;
|
||||
}
|
||||
d->entries[count].size = f->st.st_size;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* A qsort ordering function for pchf_entry structures. */
|
||||
|
||||
static int
|
||||
pchf_save_compare (const void *e1, const void *e2)
|
||||
{
|
||||
return memcmp (e1, e2, sizeof (struct pchf_entry));
|
||||
}
|
||||
|
||||
/* Create and write to F a pchf_data structure. */
|
||||
|
||||
bool
|
||||
_cpp_save_file_entries (cpp_reader *pfile, FILE *f)
|
||||
{
|
||||
size_t count = 0;
|
||||
struct pchf_data *result;
|
||||
size_t result_size;
|
||||
struct pchf_adder_info pai;
|
||||
|
||||
count = htab_elements (pfile->file_hash);
|
||||
result_size = (sizeof (struct pchf_data)
|
||||
+ sizeof (struct pchf_entry) * (count - 1));
|
||||
result = xcalloc (result_size, 1);
|
||||
|
||||
result->count = 0;
|
||||
result->have_once_only = false;
|
||||
|
||||
pai.pfile = pfile;
|
||||
pai.d = result;
|
||||
htab_traverse (pfile->file_hash, pchf_adder, &pai);
|
||||
|
||||
result_size = (sizeof (struct pchf_data)
|
||||
+ sizeof (struct pchf_entry) * (result->count - 1));
|
||||
|
||||
qsort (result->entries, result->count, sizeof (struct pchf_entry),
|
||||
pchf_save_compare);
|
||||
|
||||
return fwrite (result, result_size, 1, f) == 1;
|
||||
}
|
||||
|
||||
/* Read the pchf_data structure from F. */
|
||||
|
||||
bool
|
||||
_cpp_read_file_entries (cpp_reader *pfile ATTRIBUTE_UNUSED, FILE *f)
|
||||
{
|
||||
struct pchf_data d;
|
||||
|
||||
if (fread (&d, sizeof (struct pchf_data) - sizeof (struct pchf_entry), 1, f)
|
||||
!= 1)
|
||||
return false;
|
||||
|
||||
pchf = xmalloc (sizeof (struct pchf_data)
|
||||
+ sizeof (struct pchf_entry) * (d.count - 1));
|
||||
memcpy (pchf, &d, sizeof (struct pchf_data) - sizeof (struct pchf_entry));
|
||||
if (fread (pchf->entries, sizeof (struct pchf_entry), d.count, f)
|
||||
!= d.count)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* The parameters for pchf_compare. */
|
||||
|
||||
struct pchf_compare_data
|
||||
{
|
||||
/* The size of the file we're looking for. */
|
||||
off_t size;
|
||||
|
||||
/* The MD5 checksum of the file, if it's been computed. */
|
||||
unsigned char sum[16];
|
||||
|
||||
/* Is SUM valid? */
|
||||
bool sum_computed;
|
||||
|
||||
/* Do we need to worry about entries that don't have ONCE_ONLY set? */
|
||||
bool check_included;
|
||||
|
||||
/* The file that we're searching for. */
|
||||
_cpp_file *f;
|
||||
};
|
||||
|
||||
/* bsearch comparison function; look for D_P in E_P. */
|
||||
|
||||
static int
|
||||
pchf_compare (const void *d_p, const void *e_p)
|
||||
{
|
||||
const struct pchf_entry *e = (const struct pchf_entry *)e_p;
|
||||
struct pchf_compare_data *d = (struct pchf_compare_data *)d_p;
|
||||
int result;
|
||||
|
||||
result = memcmp (&d->size, &e->size, sizeof (off_t));
|
||||
if (result != 0)
|
||||
return result;
|
||||
|
||||
if (! d->sum_computed)
|
||||
{
|
||||
_cpp_file *const f = d->f;
|
||||
|
||||
md5_buffer ((const char *)f->buffer, f->st.st_size, d->sum);
|
||||
d->sum_computed = true;
|
||||
}
|
||||
|
||||
result = memcmp (d->sum, e->sum, 16);
|
||||
if (result != 0)
|
||||
return result;
|
||||
|
||||
if (d->check_included || e->once_only)
|
||||
return 0;
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Check that F is not in a list read from a PCH file (if any).
|
||||
Assumes that f->buffer_valid is true. Return TRUE if the file
|
||||
should not be read. */
|
||||
|
||||
static bool
|
||||
check_file_against_entries (cpp_reader *pfile ATTRIBUTE_UNUSED,
|
||||
_cpp_file *f,
|
||||
bool check_included)
|
||||
{
|
||||
struct pchf_compare_data d;
|
||||
|
||||
if (pchf == NULL
|
||||
|| (! check_included && ! pchf->have_once_only))
|
||||
return false;
|
||||
|
||||
d.size = f->st.st_size;
|
||||
d.sum_computed = false;
|
||||
d.f = f;
|
||||
d.check_included = check_included;
|
||||
return bsearch (&d, pchf->entries, pchf->count, sizeof (struct pchf_entry),
|
||||
pchf_compare) != NULL;
|
||||
}
|
||||
|
|
|
@ -530,6 +530,8 @@ extern void _cpp_report_missing_guards (cpp_reader *);
|
|||
extern void _cpp_init_files (cpp_reader *);
|
||||
extern void _cpp_cleanup_files (cpp_reader *);
|
||||
extern void _cpp_pop_file_buffer (cpp_reader *, struct _cpp_file *);
|
||||
extern bool _cpp_save_file_entries (cpp_reader *pfile, FILE *f);
|
||||
extern bool _cpp_read_file_entries (cpp_reader *, FILE *);
|
||||
|
||||
/* In cppexp.c */
|
||||
extern bool _cpp_parse_expr (cpp_reader *);
|
||||
|
|
11
gcc/cpppch.c
11
gcc/cpppch.c
|
@ -1,5 +1,5 @@
|
|||
/* Part of CPP library. (Precompiled header reading/writing.)
|
||||
Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
|
@ -366,6 +366,12 @@ cpp_write_pch_state (cpp_reader *r, FILE *f)
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (! _cpp_save_file_entries (r, f))
|
||||
{
|
||||
cpp_errno (r, CPP_DL_ERROR, "while writing precompiled header");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -709,6 +715,9 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
|
|||
!= 0)
|
||||
goto error;
|
||||
|
||||
if (! _cpp_read_file_entries (r, f))
|
||||
goto error;
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
|
|
|
@ -1,3 +1,11 @@
|
|||
2004-01-16 Geoffrey Keating <geoffk@apple.com>
|
||||
|
||||
* gcc.dg/pch/import-1.c: New.
|
||||
* gcc.dg/pch/import-1.hs: New.
|
||||
* gcc.dg/pch/import-1a.h: New.
|
||||
* gcc.dg/pch/import-1b.h: New.
|
||||
* gcc.dg/pch/import-1c.h: New.
|
||||
|
||||
2004-01-16 Mark Mitchell <mark@codesourcery.com>
|
||||
|
||||
PR c++/13574
|
||||
|
|
21
gcc/testsuite/gcc.dg/pch/import-1.c
Normal file
21
gcc/testsuite/gcc.dg/pch/import-1.c
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* { dg-options "-I. -I $srcdir/gcc.dg/pch" } */
|
||||
#include "import-1.h"
|
||||
#include "import-1a.h"
|
||||
#import "import-1b.h"
|
||||
#include "import-1c.h"
|
||||
|
||||
#ifndef IMPORT_1A
|
||||
IMPORT_1A not defined
|
||||
#endif
|
||||
|
||||
#ifndef IMPORT_1B
|
||||
IMPORT_1B not defined
|
||||
#endif
|
||||
|
||||
#ifndef IMPORT_1C
|
||||
IMPORT_1C not defined
|
||||
#endif
|
||||
|
||||
#ifndef IMPORT_1
|
||||
IMPORT_1 not defined
|
||||
#endif
|
5
gcc/testsuite/gcc.dg/pch/import-1.hs
Normal file
5
gcc/testsuite/gcc.dg/pch/import-1.hs
Normal file
|
@ -0,0 +1,5 @@
|
|||
/* { dg-options "-I. -I $srcdir/gcc.dg/pch" } */
|
||||
#import "import-1a.h"
|
||||
#include "import-1b.h"
|
||||
#include "import-1c.h"
|
||||
#define IMPORT_1
|
5
gcc/testsuite/gcc.dg/pch/import-1a.h
Normal file
5
gcc/testsuite/gcc.dg/pch/import-1a.h
Normal file
|
@ -0,0 +1,5 @@
|
|||
#ifdef IMPORT_1A
|
||||
#error import-1a failure
|
||||
#endif
|
||||
#define IMPORT_1A
|
||||
|
4
gcc/testsuite/gcc.dg/pch/import-1b.h
Normal file
4
gcc/testsuite/gcc.dg/pch/import-1b.h
Normal file
|
@ -0,0 +1,4 @@
|
|||
#ifdef IMPORT_1B
|
||||
#error import-1b failure
|
||||
#endif
|
||||
#define IMPORT_1B
|
6
gcc/testsuite/gcc.dg/pch/import-1c.h
Normal file
6
gcc/testsuite/gcc.dg/pch/import-1c.h
Normal file
|
@ -0,0 +1,6 @@
|
|||
#pragma once
|
||||
#ifdef IMPORT_1C
|
||||
#error import-1c failure
|
||||
#endif
|
||||
#define IMPORT_1C
|
||||
|
Loading…
Add table
Reference in a new issue