Author: nico Date: Fri Jan 4 17:19:14 2019 New Revision: 350453 URL: http://llvm.org/viewvc/llvm-project?rev=350453&view=rev Log: Let new test from r350340 still pass even after r350451.
Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendAction.cpp?rev=350453&r1=350452&r2=350453&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/FrontendAction.cpp (original) +++ cfe/trunk/lib/Frontend/FrontendAction.cpp Fri Jan 4 17:19:14 2019 @@ -152,10 +152,6 @@ FrontendAction::CreateWrappedASTConsumer 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 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; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits