Author: john.brawn Date: Thu Jul 28 12:17:22 2016 New Revision: 277008 URL: http://llvm.org/viewvc/llvm-project?rev=277008&view=rev Log: Revert r276973 "Adjust Registry interface to not require plugins to export a registry"
Buildbot failures when building with clang -Werror. Reverting while I try to figure this out. Modified: cfe/trunk/examples/AnnotateFunctions/CMakeLists.txt cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt cfe/trunk/include/clang/Frontend/FrontendPluginRegistry.h cfe/trunk/include/clang/Lex/Preprocessor.h cfe/trunk/lib/Frontend/FrontendAction.cpp cfe/trunk/lib/Lex/Preprocessor.cpp cfe/trunk/lib/Tooling/CompilationDatabase.cpp Modified: cfe/trunk/examples/AnnotateFunctions/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/AnnotateFunctions/CMakeLists.txt?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/examples/AnnotateFunctions/CMakeLists.txt (original) +++ cfe/trunk/examples/AnnotateFunctions/CMakeLists.txt Thu Jul 28 12:17:22 2016 @@ -1,4 +1,4 @@ -add_llvm_loadable_module(AnnotateFunctions AnnotateFunctions.cpp PLUGIN_TOOL clang) +add_llvm_loadable_module(AnnotateFunctions AnnotateFunctions.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(AnnotateFunctions PRIVATE Modified: cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt (original) +++ cfe/trunk/examples/PrintFunctionNames/CMakeLists.txt Thu Jul 28 12:17:22 2016 @@ -9,7 +9,7 @@ if( NOT MSVC ) # MSVC mangles symbols di endif() endif() -add_llvm_loadable_module(PrintFunctionNames PrintFunctionNames.cpp PLUGIN_TOOL clang) +add_llvm_loadable_module(PrintFunctionNames PrintFunctionNames.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(PrintFunctionNames PRIVATE Modified: cfe/trunk/include/clang/Frontend/FrontendPluginRegistry.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/FrontendPluginRegistry.h?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/include/clang/Frontend/FrontendPluginRegistry.h (original) +++ cfe/trunk/include/clang/Frontend/FrontendPluginRegistry.h Thu Jul 28 12:17:22 2016 @@ -13,6 +13,9 @@ #include "clang/Frontend/FrontendAction.h" #include "llvm/Support/Registry.h" +// Instantiated in FrontendAction.cpp. +extern template class llvm::Registry<clang::PluginASTAction>; + namespace clang { /// The frontend plugin registry. Modified: cfe/trunk/include/clang/Lex/Preprocessor.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/Preprocessor.h?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/include/clang/Lex/Preprocessor.h (original) +++ cfe/trunk/include/clang/Lex/Preprocessor.h Thu Jul 28 12:17:22 2016 @@ -1972,4 +1972,6 @@ typedef llvm::Registry<PragmaHandler> Pr } // end namespace clang +extern template class llvm::Registry<clang::PragmaHandler>; + #endif Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendAction.cpp?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/FrontendAction.cpp (original) +++ cfe/trunk/lib/Frontend/FrontendAction.cpp Thu Jul 28 12:17:22 2016 @@ -33,7 +33,7 @@ #include <system_error> using namespace clang; -LLVM_INSTANTIATE_REGISTRY(FrontendPluginRegistry) +template class llvm::Registry<clang::PluginASTAction>; namespace { Modified: cfe/trunk/lib/Lex/Preprocessor.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/lib/Lex/Preprocessor.cpp (original) +++ cfe/trunk/lib/Lex/Preprocessor.cpp Thu Jul 28 12:17:22 2016 @@ -54,7 +54,7 @@ #include <utility> using namespace clang; -LLVM_INSTANTIATE_REGISTRY(PragmaHandlerRegistry) +template class llvm::Registry<clang::PragmaHandler>; //===----------------------------------------------------------------------===// ExternalPreprocessorSource::~ExternalPreprocessorSource() { } Modified: cfe/trunk/lib/Tooling/CompilationDatabase.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/CompilationDatabase.cpp?rev=277008&r1=277007&r2=277008&view=diff ============================================================================== --- cfe/trunk/lib/Tooling/CompilationDatabase.cpp (original) +++ cfe/trunk/lib/Tooling/CompilationDatabase.cpp Thu Jul 28 12:17:22 2016 @@ -32,8 +32,6 @@ using namespace clang; using namespace tooling; -LLVM_INSTANTIATE_REGISTRY(CompilationDatabasePluginRegistry) - CompilationDatabase::~CompilationDatabase() {} std::unique_ptr<CompilationDatabase> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits