diff options
author | Nico Weber <nicolasweber@gmx.de> | 2019-01-05 01:19:14 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2019-01-05 01:19:14 +0000 |
commit | b215d0731a54325f5fd8e0dae41415a6446ec6ff (patch) | |
tree | 63c24c48fb0e796ed10d55c22a58098927765f62 /clang/lib/Frontend/FrontendAction.cpp | |
parent | 383be892fc875284fff1c01d03a32c779c48daeb (diff) | |
download | bcm5719-llvm-b215d0731a54325f5fd8e0dae41415a6446ec6ff.tar.gz bcm5719-llvm-b215d0731a54325f5fd8e0dae41415a6446ec6ff.zip |
Let new test from r350340 still pass even after r350451.
llvm-svn: 350453
Diffstat (limited to 'clang/lib/Frontend/FrontendAction.cpp')
-rw-r--r-- | clang/lib/Frontend/FrontendAction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index a1866e48cc4..f5226380b4d 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -152,10 +152,6 @@ FrontendAction::CreateWrappedASTConsumer(CompilerInstance &CI, if (!Consumer) return nullptr; - // If there are no registered plugins we don't need to wrap the consumer - if (FrontendPluginRegistry::begin() == FrontendPluginRegistry::end()) - return Consumer; - // Validate -add-plugin args. bool FoundAllPlugins = true; for (const std::string &Arg : CI.getFrontendOpts().AddPluginActions) { @@ -174,6 +170,10 @@ FrontendAction::CreateWrappedASTConsumer(CompilerInstance &CI, if (!FoundAllPlugins) return nullptr; + // If there are no registered plugins we don't need to wrap the consumer + if (FrontendPluginRegistry::begin() == FrontendPluginRegistry::end()) + return Consumer; + // If this is a code completion run, avoid invoking the plugin consumers if (CI.hasCodeCompletionConsumer()) return Consumer; |