From ca708025539dace762e23c1a5f97570a51020fc3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 9 Apr 2015 13:37:53 +0000 Subject: [PATCH] re PR pch/65550 (ICE (segfault) with pch) 2015-04-09 Richard Biener PR pch/65550 * files.c (pch_open_file): Allow main and pre-included files when trying to open a PCH. From-SVN: r221949 --- libcpp/ChangeLog | 6 ++++++ libcpp/files.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 2ad145f8cc8..7f6603d0842 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2015-04-09 Richard Biener + + PR pch/65550 + * files.c (pch_open_file): Allow main and pre-included files + when trying to open a PCH. + 2015-04-06 Jakub Jelinek PR preprocessor/61977 diff --git a/libcpp/files.c b/libcpp/files.c index a995071ad06..2f491224c6f 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -291,11 +291,13 @@ pch_open_file (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch) /* If the file is not included as first include from either the toplevel file or the command-line it is not a valid use of PCH. */ - if (pfile->all_files - && pfile->all_files->next_file - && !(pfile->all_files->implicit_preinclude - || pfile->all_files->next_file->implicit_preinclude)) - return false; + for (_cpp_file *f = pfile->all_files; f; f = f->next_file) + if (f->implicit_preinclude) + continue; + else if (f->main_file) + break; + else + return false; flen = strlen (path); len = flen + sizeof (extension); -- 2.30.2