diff options
| author | bors <bors@rust-lang.org> | 2018-07-16 09:41:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-16 09:41:54 +0000 |
| commit | 3d5753fda1ee8f729da1061e931e13b043f479a5 (patch) | |
| tree | 520829f521d866f7cc80b23ad5c8066e6234866c /src/rustllvm/PassWrapper.cpp | |
| parent | 1fa76a45024412c268237b840294ae3056035ff4 (diff) | |
| parent | d992090a702dff976a6d05a9b53b0d7b82199d14 (diff) | |
| download | rust-3d5753fda1ee8f729da1061e931e13b043f479a5.tar.gz rust-3d5753fda1ee8f729da1061e931e13b043f479a5.zip | |
Auto merge of #52422 - michaelwoerister:revert-52266, r=oli-obk
Revert #52266 Reverts #52266 until the performance issues with that PR are ironed out.
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 1f96b9042ba..a00ff3b345d 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -1099,30 +1099,6 @@ LLVMRustPrepareThinLTOImport(const LLVMRustThinLTOData *Data, LLVMModuleRef M) { return true; } -extern "C" typedef void (*LLVMRustModuleNameCallback)(void*, // payload - const char*, // importing module name - const char*); // imported module name - -// Calls `module_name_callback` for each module import done by ThinLTO. -// The callback is provided with regular null-terminated C strings. -extern "C" void -LLVMRustGetThinLTOModuleImports(const LLVMRustThinLTOData *data, - LLVMRustModuleNameCallback module_name_callback, - void* callback_payload) { - for (const auto& importing_module : data->ImportLists) { - const std::string importing_module_id = importing_module.getKey().str(); - - const auto& imports = importing_module.getValue(); - - for (const auto& imported_module : imports) { - const std::string imported_module_id = imported_module.getKey().str(); - module_name_callback(callback_payload, - importing_module_id.c_str(), - imported_module_id.c_str()); - } - } -} - // This struct and various functions are sort of a hack right now, but the // problem is that we've got in-memory LLVM modules after we generate and // optimize all codegen-units for one compilation in rustc. To be compatible @@ -1304,11 +1280,6 @@ LLVMRustPrepareThinLTOImport(const LLVMRustThinLTOData *Data, LLVMModuleRef M) { report_fatal_error("ThinLTO not available"); } -extern "C" LLVMRustThinLTOModuleImports -LLVMRustGetLLVMRustThinLTOModuleImports(const LLVMRustThinLTOData *Data) { - report_fatal_error("ThinLTO not available"); -} - extern "C" void LLVMRustFreeThinLTOData(LLVMRustThinLTOData *Data) { report_fatal_error("ThinLTO not available"); |
