From cbc31d699b75b6d14ac50117386814270cd6a859 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 12 Feb 2016 15:28:45 +0000 Subject: Delete the deprecated LLVMLinkModules. llvm-svn: 260683 --- llvm/lib/Linker/LinkModules.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'llvm/lib/Linker/LinkModules.cpp') diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index b96a6f42705..f17d5371b0e 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -557,11 +557,6 @@ bool Linker::linkInModule(std::unique_ptr Src, unsigned Flags, return ModLinker.run(); } -bool Linker::linkInModuleForCAPI(Module &Src) { - ModuleLinker ModLinker(Mover, Src, 0, nullptr, nullptr); - return ModLinker.run(); -} - bool Linker::linkInMetadata(Module &Src, DenseMap *ValIDToTempMDMap) { SetVector ValuesToLink; @@ -592,35 +587,6 @@ bool Linker::linkModules(Module &Dest, std::unique_ptr Src, // C API. //===----------------------------------------------------------------------===// -static void diagnosticHandler(const DiagnosticInfo &DI, void *C) { - auto *Message = reinterpret_cast(C); - raw_string_ostream Stream(*Message); - DiagnosticPrinterRawOStream DP(Stream); - DI.print(DP); -} - -LLVMBool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src, - LLVMLinkerMode Unused, char **OutMessages) { - Module *D = unwrap(Dest); - LLVMContext &Ctx = D->getContext(); - - LLVMContext::DiagnosticHandlerTy OldDiagnosticHandler = - Ctx.getDiagnosticHandler(); - void *OldDiagnosticContext = Ctx.getDiagnosticContext(); - std::string Message; - Ctx.setDiagnosticHandler(diagnosticHandler, &Message, true); - - Linker L(*D); - Module *M = unwrap(Src); - LLVMBool Result = L.linkInModuleForCAPI(*M); - - Ctx.setDiagnosticHandler(OldDiagnosticHandler, OldDiagnosticContext, true); - - if (OutMessages && Result) - *OutMessages = strdup(Message.c_str()); - return Result; -} - LLVMBool LLVMLinkModules2(LLVMModuleRef Dest, LLVMModuleRef Src) { Module *D = unwrap(Dest); std::unique_ptr M(unwrap(Src)); -- cgit v1.2.3