Silence warnings in OCaml bindings

* LLVMDisposeMessage lives in llvm-c/Core.h, include this file where necessary
* LLVMAddTargetData has been removed, follow suit in the bindings

Differential Revision: http://reviews.llvm.org/D18633

llvm-svn: 265001

6 files changed, 4 insertions, 20 deletions

diff --git a/llvm/bindings/ocaml/analysis/analysis_ocaml.c b/llvm/bindings/ocaml/analysis/analysis_ocaml.c
index 44e31970a4b..9b746d626d5 100644
--- a/llvm/bindings/ocaml/analysis/analysis_ocaml.c
+++ b/llvm/bindings/ocaml/analysis/analysis_ocaml.c
@@ -15,6 +15,7 @@
 |*                                                                            *|
 \*===----------------------------------------------------------------------===*/
 
+#include "llvm-c/Core.h"
 #include "llvm-c/Analysis.h"
 #include "caml/alloc.h"
 #include "caml/mlvalues.h"
diff --git a/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c b/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c
index b7992508bf9..a5e62aca8a4 100644
--- a/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c
+++ b/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c
@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include <assert.h>
+#include "llvm-c/Core.h"
 #include "llvm-c/ExecutionEngine.h"
 #include "llvm-c/Target.h"
 #include "caml/alloc.h"
diff --git a/llvm/bindings/ocaml/target/llvm_target.ml b/llvm/bindings/ocaml/target/llvm_target.ml
index d4910ac56f3..f968587576f 100644
--- a/llvm/bindings/ocaml/target/llvm_target.ml
+++ b/llvm/bindings/ocaml/target/llvm_target.ml
@@ -54,9 +54,6 @@ module DataLayout = struct
 
   external of_string : string -> t = "llvm_datalayout_of_string"
   external as_string : t -> string = "llvm_datalayout_as_string"
-  external add_to_pass_manager : [<Llvm.PassManager.any]
-                                 Llvm.PassManager.t -> t -> unit
-                               = "llvm_datalayout_add_to_pass_manager"
   external byte_order : t -> Endian.t = "llvm_datalayout_byte_order"
   external pointer_size : t -> int = "llvm_datalayout_pointer_size"
   external intptr_type : Llvm.llcontext -> t -> Llvm.lltype
diff --git a/llvm/bindings/ocaml/target/llvm_target.mli b/llvm/bindings/ocaml/target/llvm_target.mli
index e826d5c4015..c1e52317c49 100644
--- a/llvm/bindings/ocaml/target/llvm_target.mli
+++ b/llvm/bindings/ocaml/target/llvm_target.mli
@@ -67,12 +67,6 @@ module DataLayout : sig
       See the method [llvm::DataLayout::getStringRepresentation]. *)
   val as_string : t -> string
 
-  (** [add_to_pass_manager pm dl] adds the data layout [dl] to
-      the pass manager [pm].
-      See the method [llvm::PassManagerBase::add]. *)
-  val add_to_pass_manager : [<Llvm.PassManager.any] Llvm.PassManager.t ->
-                            t -> unit
-
   (** Returns the byte order of a target, either [Endian.Big] or
       [Endian.Little].
       See the method [llvm::DataLayout::isLittleEndian]. *)
diff --git a/llvm/bindings/ocaml/target/target_ocaml.c b/llvm/bindings/ocaml/target/target_ocaml.c
index acc45da990f..4cd64dce3ae 100644
--- a/llvm/bindings/ocaml/target/target_ocaml.c
+++ b/llvm/bindings/ocaml/target/target_ocaml.c
@@ -15,6 +15,7 @@
 |*                                                                            *|
 \*===----------------------------------------------------------------------===*/
 
+#include "llvm-c/Core.h"
 #include "llvm-c/Target.h"
 #include "llvm-c/TargetMachine.h"
 #include "caml/alloc.h"
@@ -64,13 +65,6 @@ CAMLprim value llvm_datalayout_as_string(value TD) {
   return Copy;
 }
 
-/* [<Llvm.PassManager.any] Llvm.PassManager.t -> DataLayout.t -> unit */
-CAMLprim value llvm_datalayout_add_to_pass_manager(LLVMPassManagerRef PM,
-                                                   value DL) {
-  LLVMAddTargetData(DataLayout_val(DL), PM);
-  return Val_unit;
-}
-
 /* DataLayout.t -> Endian.t */
 CAMLprim value llvm_datalayout_byte_order(value DL) {
   return Val_int(LLVMByteOrder(DataLayout_val(DL)));
diff --git a/llvm/test/Bindings/OCaml/target.ml b/llvm/test/Bindings/OCaml/target.ml
index c756f6728c3..26deb46a8d8 100644
--- a/llvm/test/Bindings/OCaml/target.ml
+++ b/llvm/test/Bindings/OCaml/target.ml
@@ -58,10 +58,7 @@ let test_target_data () =
   assert_equal (DL.preferred_align sty dl) 8;
   assert_equal (DL.preferred_align_of_global (declare_global sty "g" m) dl) 8;
   assert_equal (DL.element_at_offset sty (Int64.of_int 1) dl) 0;
-  assert_equal (DL.offset_of_element sty 1 dl) (Int64.of_int 4);
-
-  let pm = PassManager.create () in
-  ignore (DL.add_to_pass_manager pm dl)
+  assert_equal (DL.offset_of_element sty 1 dl) (Int64.of_int 4)
 
 
 (*===-- Target ------------------------------------------------------------===*)