summaryrefslogtreecommitdiff
path: root/lib/FrontendTool
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2016-02-11 16:33:20 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2016-02-11 16:33:20 +0000
commit7eba45f7ef2d6917db1ef0143e4dab41d77b3bf7 (patch)
tree55ef3c5b1cb1501df4d413924af038b34fe20a89 /lib/FrontendTool
parentaba1af8a470c221bd473553cc41ae1f2f545444c (diff)
Revert r260265, "clang-cl: Support loading plugins on Windows"
It causes memory exhaust on mingw-w64(x64). Investigating. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260536 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/FrontendTool')
-rw-r--r--lib/FrontendTool/ExecuteCompilerInvocation.cpp9
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.