1 files changed, 1 insertions, 8 deletions
diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index 90642abb5d..116590e537 100644
--- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -189,16 +189,9 @@ bool clang::ExecuteCompilerInvocation(CompilerInstance *Clang) {
          e = Clang->getFrontendOpts().Plugins.size(); i != e; ++i) {
     const std::string &Path = Clang->getFrontendOpts().Plugins[i];
     std::string Error;
-    llvm::sys::DynamicLibrary DL(
-        llvm::sys::DynamicLibrary::getPermanentLibrary(Path.c_str(), &Error));
-    if (DL.isValid()) {
-      // On Windows, we need to import the plugin front-end action
-      // dynamically.
-      LLVM_IMPORT_REGISTRY(FrontendPluginRegistry, DL);
-    } else {
+    if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(Path.c_str(), &Error))
       Clang->getDiagnostics().Report(diag::err_fe_unable_to_load_plugin)
         << Path << Error;
-    }
   }
 
   // Honor -mllvm.