diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-06-14 17:36:05 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-06-14 17:36:05 +0000 |
| commit | 76cae518cf86c42a1ad833c50f4f1999f1c86d03 (patch) | |
| tree | 23275c8a4eb675607c0850fe2615855066f9ddab | |
| parent | 619117a31d89f4291bcdfacb9bfed054c734cd61 (diff) | |
| download | bcm5719-llvm-76cae518cf86c42a1ad833c50f4f1999f1c86d03.tar.gz bcm5719-llvm-76cae518cf86c42a1ad833c50f4f1999f1c86d03.zip | |
Fix crash on missing header in -rewrite-includes.
llvm-svn: 158459
| -rw-r--r-- | clang/lib/Rewrite/InclusionRewriter.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Frontend/rewrite-includes-missing.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Rewrite/InclusionRewriter.cpp b/clang/lib/Rewrite/InclusionRewriter.cpp index 2dd6b34f613..3dfc3b00898 100644 --- a/clang/lib/Rewrite/InclusionRewriter.cpp +++ b/clang/lib/Rewrite/InclusionRewriter.cpp @@ -250,7 +250,8 @@ bool InclusionRewriter::Process(FileID FileId, { bool Invalid; const MemoryBuffer &FromFile = *SM.getBuffer(FileId, &Invalid); - assert(!Invalid && "Invalid FileID while trying to rewrite includes"); + if (Invalid) // invalid inclusion + return true; const char *FileName = FromFile.getBufferIdentifier(); Lexer RawLex(FileId, &FromFile, PP.getSourceManager(), PP.getLangOpts()); RawLex.SetCommentRetentionState(false); diff --git a/clang/test/Frontend/rewrite-includes-missing.c b/clang/test/Frontend/rewrite-includes-missing.c new file mode 100644 index 00000000000..d16fbebea65 --- /dev/null +++ b/clang/test/Frontend/rewrite-includes-missing.c @@ -0,0 +1,7 @@ +// RUN: %clang_cc1 -verify -E -frewrite-includes %s -o - | FileCheck -strict-whitespace %s + +#include "foobar.h" // expected-error {{'foobar.h' file not found}} +// CHECK: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#include "foobar.h" +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} +// CHECK-NEXT: {{^}}# 4 "/usr/local/google/home/blaikie/Development/llvm/src/tools/clang/test/Frontend/rewrite-includes-missing.c" 2{{$}} |
