r187329 - Avoid crashing if a directory has no pch files.
Rafael Espindola
rafael.espindola at gmail.com
Sun Jul 28 06:23:37 PDT 2013
Author: rafael
Date: Sun Jul 28 08:23:37 2013
New Revision: 187329
URL: http://llvm.org/viewvc/llvm-project?rev=187329&view=rev
Log:
Avoid crashing if a directory has no pch files.
Should fix some of the bots that have assertions disabled.
Modified:
cfe/trunk/lib/Frontend/FrontendAction.cpp
cfe/trunk/test/PCH/badpch.c
Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendAction.cpp?rev=187329&r1=187328&r2=187329&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendAction.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendAction.cpp Sun Jul 28 08:23:37 2013
@@ -455,6 +455,8 @@ bool FrontendAction::shouldEraseOutputFi
void ASTFrontendAction::ExecuteAction() {
CompilerInstance &CI = getCompilerInstance();
+ if (!CI.hasPreprocessor())
+ return;
// FIXME: Move the truncation aspect of this into Sema, we delayed this till
// here so the source manager would be initialized.
Modified: cfe/trunk/test/PCH/badpch.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/badpch.c?rev=187329&r1=187328&r2=187329&view=diff
==============================================================================
--- cfe/trunk/test/PCH/badpch.c (original)
+++ cfe/trunk/test/PCH/badpch.c Sun Jul 28 08:23:37 2013
@@ -1,5 +1,5 @@
// RUN: not %clang_cc1 -fsyntax-only -include-pch %S/Inputs/badpch-empty.h.gch %s 2>&1 | FileCheck -check-prefix=CHECK-EMPTY %s
-// RUN: not --crash %clang_cc1 -fsyntax-only -include-pch %S/Inputs/badpch-dir.h.gch %s 2>&1 | FileCheck -check-prefix=CHECK-DIR %s
+// RUN: not %clang_cc1 -fsyntax-only -include-pch %S/Inputs/badpch-dir.h.gch %s 2>&1 | FileCheck -check-prefix=CHECK-DIR %s
// The purpose of this test is to verify that various invalid PCH files are
// reported as such.
More information about the cfe-commits
mailing list