OCaml bindings: Add functions for accessing metadata nodes

[destrius]

Summary

Added llvm_get_mdnode_operands function, which allow access to the operands inside an MDNode.

[whitequark]

bindings/ocaml/llvm/llvm.mli

857 ↗

(On Diff #54320)

I don't think this function is useful.

861 ↗

(On Diff #54320)

Please add a test for this one.

[destrius]

Removed get_mdnode_count function, and added a test in test/Bindings/OCaml/core.ml. Not sure if the test works right as I can't run the test suite properly on my system right now.

[whitequark]

LGTM, but please commit once you are certain that tests are pass.

[destrius]

Fixed a missing semicolon in the test for get_mdnode_operands.

Fixed a bunch of tests in test/Bindings/OCaml/core.ml, allowing the check-llvm-bindings-ocaml test suite to complete successfully with no errors.

Also, it turns out that the tests had been marked as unsupported in lit.local.cfg, so they don't run by default. I'm leaving that as it is because I don't think I'm in a position to decide whether or not to change it back to supported.

[whitequark]

test/Bindings/OCaml/core.ml

1168 ↗

(On Diff #54982)

Just remove this. That interface will need to be redone.

1200 ↗

(On Diff #54982)

The personality function is now a part of the function signature, so please move the check there.

1454 ↗

(On Diff #54982)

Ditto, remove.

[destrius]

New diff is against current (21/06/16) git repository. Fixes to the OCaml bindings tests have been added there, so we only need to add the test for get_mdnode_operands.

Sorry for taking so long on this, was caught up with work.

[whitequark]

LGTM

[destrius]

Thanks! I'm a bit unsure how to proceed now, since I don't have commit
access to the repository. Could you help me do the commit, or is there some
procedure by which I can add it to some commit queue?

Thanks,
Xinyu

llvm/trunk/bindings/ocaml/llvm/llvm.ml

 external set_metadata : llvalue -> llmdkind -> llvalue -> unit = "llvm_set_metadata"
 external clear_metadata : llvalue -> llmdkind -> unit = "llvm_clear_metadata"
 
 (*--... Operations on metadata .......,.....................................--*)
 external mdstring : llcontext -> string -> llvalue = "llvm_mdstring"
 external mdnode : llcontext -> llvalue array -> llvalue = "llvm_mdnode"
 external mdnull : llcontext -> llvalue = "llvm_mdnull"
 external get_mdstring : llvalue -> string option = "llvm_get_mdstring"
+external get_mdnode_operands : llvalue -> llvalue array
+                            = "llvm_get_mdnode_operands"
 external get_named_metadata : llmodule -> string -> llvalue array
                             = "llvm_get_namedmd"
 external add_named_metadata_operand : llmodule -> string -> llvalue -> unit
                                     = "llvm_append_namedmd"
 
 (*--... Operations on scalar constants .....................................--*)
 external const_int : lltype -> int -> llvalue = "llvm_const_int"
 external const_of_int64 : lltype -> Int64.t -> bool -> llvalue

llvm/trunk/bindings/ocaml/llvm/llvm.mli

 
 (** [mdnull c ] returns a null MDNode in context [c].  *)
 val mdnull : llcontext -> llvalue
 
 (** [get_mdstring v] returns the MDString.
     See the method [llvm::MDString::getString] *)
 val get_mdstring : llvalue -> string option
 
+(** [get_mdnode_operands v] returns the operands in the MDNode. *)
+(*     See the method [llvm::MDNode::getOperand] *)
+val get_mdnode_operands : llvalue -> llvalue array
+
 (** [get_named_metadata m name] returns all the MDNodes belonging to the named
     metadata (if any).
     See the method [llvm::NamedMDNode::getOperand]. *)
 val get_named_metadata : llmodule -> string -> llvalue array
 
 (** [add_named_metadata_operand m name v] adds [v] as the last operand of
     metadata named [name] in module [m]. If the metadata does not exist,
     it is created.

llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c

if ((S = LLVMGetMDString(V, &Len))) {
     memcpy(String_val(Str), S, Len);
     Option = alloc(1,0);
     Store_field(Option, 0, Str);
     CAMLreturn(Option);
   }
   CAMLreturn(Val_int(0));
 }
 
+CAMLprim value llvm_get_mdnode_operands(LLVMValueRef V) {
+  CAMLparam0();
+  CAMLlocal1(Operands);
+  unsigned int n;
+
+  n = LLVMGetMDNodeNumOperands(V);
+  Operands = alloc(n, 0);
+  LLVMGetMDNodeOperands(V, (LLVMValueRef *)  Operands);
+  CAMLreturn(Operands);
+}
+
 /* llmodule -> string -> llvalue array */
 CAMLprim value llvm_get_namedmd(LLVMModuleRef M, value Name)
 {
   CAMLparam1(Name);
   CAMLlocal1(Nodes);
   Nodes = alloc(LLVMGetNamedMetadataNumOperands(M, String_val(Name)), 0);
   LLVMGetNamedMetadataOperands(M, String_val(Name), (LLVMValueRef *) Nodes);
   CAMLreturn(Nodes);

llvm/trunk/test/Bindings/OCaml/core.ml

group "metadata"; begin
     let m2 = mdstring context "metadata test" in
     let md = mdnode context [| m1; m2 |] in
 
     let kind = mdkind_id context "test" in
     set_metadata i kind md;
 
     insist ((has_metadata i) = true);
     insist ((metadata i kind) = Some md);
+    insist ((get_mdnode_operands md) = [| m1; m2 |]);
 
     clear_metadata i kind;
 
     insist ((has_metadata i) = false);
     insist ((metadata i kind) = None);
 
     set_metadata i kind md
   end;