From d78ae5429a1a94a37e8de6c5580e5462873fb92b Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Fri, 2 Jun 2017 01:05:44 +0000 Subject: [PATCH] PR32848: There isn't necessarily a FileChanged or FileSkipped for every InclusionDirective callback. In particular, you don't get one if the inclusion directive encountered an error. Don't assert in that case. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304506 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/Rewrite/InclusionRewriter.cpp | 7 +++---- test/Frontend/rewrite-includes-filenotfound.c | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 test/Frontend/rewrite-includes-filenotfound.c diff --git a/lib/Frontend/Rewrite/InclusionRewriter.cpp b/lib/Frontend/Rewrite/InclusionRewriter.cpp index d45cbc01df..3564cebba8 100644 --- a/lib/Frontend/Rewrite/InclusionRewriter.cpp +++ b/lib/Frontend/Rewrite/InclusionRewriter.cpp @@ -177,7 +177,9 @@ void InclusionRewriter::FileSkipped(const FileEntry &/*SkippedFile*/, /// directives. It does not say whether the file has been included, but it /// provides more information about the directive (hash location instead /// of location inside the included file). It is assumed that the matching -/// FileChanged() or FileSkipped() is called after this. +/// FileChanged() or FileSkipped() is called after this (or neither is +/// called if this #include results in an error or does not textually include +/// anything). void InclusionRewriter::InclusionDirective(SourceLocation HashLoc, const Token &/*IncludeTok*/, StringRef /*FileName*/, @@ -187,9 +189,6 @@ void InclusionRewriter::InclusionDirective(SourceLocation HashLoc, StringRef /*SearchPath*/, StringRef /*RelativePath*/, const Module *Imported) { - assert(LastInclusionLocation.isInvalid() && - "Another inclusion directive was found before the previous one " - "was processed"); if (Imported) { auto P = ModuleIncludes.insert( std::make_pair(HashLoc.getRawEncoding(), Imported)); diff --git a/test/Frontend/rewrite-includes-filenotfound.c b/test/Frontend/rewrite-includes-filenotfound.c new file mode 100644 index 0000000000..203dbde545 --- /dev/null +++ b/test/Frontend/rewrite-includes-filenotfound.c @@ -0,0 +1,6 @@ +// RUN: not %clang_cc1 -E -frewrite-includes %s -o - 2>&1 | FileCheck %s + +#include "this file does not exist.foo" +#include "this file also does not exist.foo" + +CHECK: fatal error: {{.*}} file not found -- 2.40.0