Make it easier to pass a custom diagnostic handler to the IR linker.

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

diff --git a/include/llvm/Linker/Linker.h b/include/llvm/Linker/Linker.h
index 18fa412d24af0ae956eefb872a92f031de8516f1..50922e3ebe225131900182083eba224e92ac4afc 100644 (file)
--- a/include/llvm/Linker/Linker.h
+++ b/include/llvm/Linker/Linker.h
@@ -12,8 +12,10 @@
 
 #include "llvm/ADT/SmallPtrSet.h"
 
-namespace llvm {
+#include <functional>
 
+namespace llvm {
+class DiagnosticInfo;
 class Module;
 class StructType;
 
@@ -28,6 +30,10 @@ class Linker {
       PreserveSource = 1 // Preserve the source module.
     };
 
+    typedef std::function<void(const DiagnosticInfo &)>
+        DiagnosticHandlerFunction;
+
+    Linker(Module *M, DiagnosticHandlerFunction DiagnosticHandler);
     Linker(Module *M);
     ~Linker();
 
@@ -44,11 +50,18 @@ class Linker {
       return linkInModule(Src, Linker::DestroySource);
     }
 
-    static bool LinkModules(Module *Dest, Module *Src, unsigned Mode);
+    static bool
+    LinkModules(Module *Dest, Module *Src, unsigned Mode,
+                DiagnosticHandlerFunction DiagnosticHandler);
+
+    static bool
+    LinkModules(Module *Dest, Module *Src, unsigned Mode);
+
 
   private:
     Module *Composite;
     SmallPtrSet<StructType*, 32> IdentifiedStructTypes;
+    DiagnosticHandlerFunction DiagnosticHandler;
 };
 
 } // End llvm namespace