diff options
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 38 | ||||
| -rw-r--r-- | clang/test/Driver/cl-pch.cpp | 17 |
2 files changed, 35 insertions, 20 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index c7a65fe5855..b855b9c5921 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1563,25 +1563,6 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, PL.clear(); types::getCompilationPhases(InputType, PL); - if (YcArg) { - // Add a separate precompile phase for the compile phase. - if (FinalPhase >= phases::Compile) { - llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> PCHPL; - types::getCompilationPhases(types::TY_CXXHeader, PCHPL); - Arg *PchInputArg = MakeInputArg(Args, Opts, YcArg->getValue()); - - // Build the pipeline for the pch file. - Action *ClangClPch = C.MakeAction<InputAction>(*PchInputArg, InputType); - for (phases::ID Phase : PCHPL) - ClangClPch = ConstructPhaseAction(C, Args, Phase, ClangClPch); - assert(ClangClPch); - Actions.push_back(ClangClPch); - // The driver currently exits after the first failed command. This - // relies on that behavior, to make sure if the pch generation fails, - // the main compilation won't run. - } - } - // If the first step comes after the final phase we are doing as part of // this compilation, warn the user about it. phases::ID InitialPhase = PL[0]; @@ -1614,6 +1595,25 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args, continue; } + if (YcArg) { + // Add a separate precompile phase for the compile phase. + if (FinalPhase >= phases::Compile) { + llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> PCHPL; + types::getCompilationPhases(types::TY_CXXHeader, PCHPL); + Arg *PchInputArg = MakeInputArg(Args, Opts, YcArg->getValue()); + + // Build the pipeline for the pch file. + Action *ClangClPch = C.MakeAction<InputAction>(*PchInputArg, InputType); + for (phases::ID Phase : PCHPL) + ClangClPch = ConstructPhaseAction(C, Args, Phase, ClangClPch); + assert(ClangClPch); + Actions.push_back(ClangClPch); + // The driver currently exits after the first failed command. This + // relies on that behavior, to make sure if the pch generation fails, + // the main compilation won't run. + } + } + phases::ID CudaInjectionPhase = (phases::Compile < FinalPhase && llvm::find(PL, phases::Compile) != PL.end()) diff --git a/clang/test/Driver/cl-pch.cpp b/clang/test/Driver/cl-pch.cpp index 075fe825f66..d8b7a660f00 100644 --- a/clang/test/Driver/cl-pch.cpp +++ b/clang/test/Driver/cl-pch.cpp @@ -296,7 +296,7 @@ // CHECK-YCTC: -o // CHECK-YCTC: pchfile.pch // CHECK-YCTC: -x -// CHECK-YCTP: "c" +// CHECK-YCTC: "c" // Also check lower-case /Tc variant. // RUN: %clang_cl -Werror /Ycpchfile.h /FIpchfile.h /c -### /Tc%s 2>&1 \ @@ -307,3 +307,18 @@ // CHECK-YCTc: pchfile.pch // CHECK-YCTc: -x // CHECK-YCTc: "c" + +// Don't crash when a non-source file is passed. +// RUN: %clang_cl -Werror /Ycpchfile.h /FIpchfile.h /c -### %S/Inputs/file.prof 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-NoSource %s +// CHECK-NoSource: file.prof:{{.*}}input unused + +// ...but if an explicit file turns the file into a source file, handle it: +// RUN: %clang_cl /TP -Werror /Ycpchfile.h /FIpchfile.h /c -### %S/Inputs/file.prof 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-NoSourceTP %s +// CHECK-NoSourceTP: cc1 +// CHECK-NoSourceTP: -emit-pch +// CHECK-NoSourceTP: -o +// CHECK-NoSourceTP: pchfile.pch +// CHECK-NoSourceTP: -x +// CHECK-NoSourceTP: "c++" |
