Always pass a diagnostic handler to the linker.

[oota-llvm.git] / include / llvm / Linker / Linker.h

diff --git a/include/llvm/Linker/Linker.h b/include/llvm/Linker/Linker.h
index f9890935126ec1f7c3f9c3b10ec177810c29d8c8..f0c8ad979ab68e36de4f8f1cb91d160c4c5358de 100644 (file)
--- a/include/llvm/Linker/Linker.h
+++ b/include/llvm/Linker/Linker.h
@@ -69,7 +69,6 @@ public:
   };
 
   Linker(Module &M, DiagnosticHandlerFunction DiagnosticHandler);
-  Linker(Module &M);
 
   /// \brief Link \p Src into the composite. The source is destroyed.
   ///
@@ -88,8 +87,9 @@ public:
                           DiagnosticHandlerFunction DiagnosticHandler,
                           unsigned Flags = Flags::None);
 
-  static bool linkModules(Module &Dest, Module &Src,
-                          unsigned Flags = Flags::None);
+  DiagnosticHandlerFunction getDiagnosticHandler() const {
+    return DiagnosticHandler;
+  }
 
 private:
   Module &Composite;