summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/FrontendAction.cpp
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2016-02-16 05:39:33 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2016-02-16 05:39:33 +0000
commite89a1795987327106de20c781fc841d21b9ce7b4 (patch)
tree9a996d3b29039fcda85df2c2fb8d9ad7a20c45ab /clang/lib/Frontend/FrontendAction.cpp
parent5590967610afa5fcc79386e08acc4d0fad5b6b9f (diff)
downloadbcm5719-llvm-e89a1795987327106de20c781fc841d21b9ce7b4.tar.gz
bcm5719-llvm-e89a1795987327106de20c781fc841d21b9ce7b4.zip
[Frontend] Make sure WrapperFrontendAction updates CurrentInput after calling BeginSourceFileAction.
I don't have a test case to add unfortunately. llvm-svn: 260937
Diffstat (limited to 'clang/lib/Frontend/FrontendAction.cpp')
-rw-r--r--clang/lib/Frontend/FrontendAction.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp
index a8166a647d5..cdaa18a7a31 100644
--- a/clang/lib/Frontend/FrontendAction.cpp
+++ b/clang/lib/Frontend/FrontendAction.cpp
@@ -559,7 +559,10 @@ bool WrapperFrontendAction::BeginSourceFileAction(CompilerInstance &CI,
StringRef Filename) {
WrappedAction->setCurrentInput(getCurrentInput());
WrappedAction->setCompilerInstance(&CI);
- return WrappedAction->BeginSourceFileAction(CI, Filename);
+ auto Ret = WrappedAction->BeginSourceFileAction(CI, Filename);
+ // BeginSourceFileAction may change CurrentInput, e.g. during module builds.
+ setCurrentInput(WrappedAction->getCurrentInput());
+ return Ret;
}
void WrapperFrontendAction::ExecuteAction() {
WrappedAction->ExecuteAction();
OpenPOWER on IntegriCloud