[OCaml] Update core test and re-enable testing

[jketema]

Summary

Update the OCaml core test to use the current IR syntax in its check lines. Also drop the creation of debug meta-data, as this is currently not supported by the C interface.

[whitequark]

test/Bindings/OCaml/core.ml

1425 ↗

(On Diff #55882)

Just remove this too. I don't think version 2 is even readable by LLVM anymore...

[jketema]

test/Bindings/OCaml/core.ml

1425 ↗

(On Diff #56689)

I updated this to version 3 instead, as this is the only test for named meta-data, and I prefer not to loose that test.

[whitequark]

LGTM

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

let test_users () =
   insist ((operand i 1) = p3);
 
   ignore (build_unreachable b)
 
 
 (*===-- Aliases -----------------------------------------------------------===*)
 
 let test_aliases () =
-  (* CHECK: @alias = alias i32* @aliasee
+  (* CHECK: @alias = alias i32, i32* @aliasee
    *)
   let forty_two32 = const_int i32_type 42 in
   let v = define_global "aliasee" forty_two32 m in
   ignore (add_alias m (pointer_type i32_type) v "alias")
 
 
 (*===-- Functions ---------------------------------------------------------===*)
 
let test_builder () =
   let f2 = build_uitofp p2 float_type "F2" atentry in
 
   let bb00 = append_block context "Bb00" fn in
   ignore (build_unreachable (builder_at_end context bb00));
 
   group "function attribute";
   begin
       ignore (add_function_attr fn Attribute.UWTable);
-      (* CHECK: X7{{.*}}#0
+      (* CHECK: X7{{.*}}#0{{.*}}personality{{.*}}@__gxx_personality_v0
        * #0 is uwtable, defined at EOF.
        *)
       insist ([Attribute.UWTable] = function_attr fn);
   end;
 
   group "casts"; begin
     let void_ptr = pointer_type i8_type in
 
group "metadata"; begin
 
     set_metadata i kind md
   end;
 
   group "named metadata"; begin
     (* !llvm.module.flags is emitted at EOF. *)
     let n1 = const_int i32_type 1 in
     let n2 = mdstring context "Debug Info Version" in
-    let n3 = const_int i32_type 2 in
+    let n3 = const_int i32_type 3 in
     let md = mdnode context [| n1; n2; n3 |] in
     add_named_metadata_operand m "llvm.module.flags" md;
 
     insist ((get_named_metadata m "llvm.module.flags") = [| md |])
   end;
 
-  group "dbg"; begin
-    (* CHECK: %dbg = add i32 %P1, %P2, !dbg !2
-     * !2 is metadata emitted at EOF.
-     *)
-    insist ((current_debug_location atentry) = Some (mdnode context [||]));
-
-    let m_line = const_int i32_type 2 in
-    let m_col = const_int i32_type 3 in
-    let m_scope = mdnode context [| |] in
-    let m_inlined = mdnode context [| |] in
-    let md = mdnode context [| m_line; m_col; m_scope; m_inlined |] in
-    set_current_debug_location atentry md;
-
-    insist ((current_debug_location atentry) = Some md);
-
-    let i = build_add p1 p2 "dbg" atentry in
-    insist ((has_metadata i) = true);
-
-    clear_current_debug_location atentry
-  end;
-
   group "ret"; begin
     (* CHECK: ret{{.*}}P1
      *)
     let ret = build_ret p1 atentry in
     position_before ret atentry
   end;
 
   (* see test/Feature/exception.ll *)
begin
        (builder_at_end context bblpad) in begin
            set_cleanup lp true;
            add_clause lp ztic;
            insist((pointer_type (pointer_type i8_type)) = type_of ztid);
            let ety = pointer_type (pointer_type i8_type) in
            add_clause lp (const_array ety [| ztipkc; ztid |]);
            ignore (build_resume lp (builder_at_end context bblpad));
       end;
-      (* CHECK: landingpad{{.*}}personality{{.*}}__gxx_personality_v0
+      (* CHECK: landingpad
        * CHECK: cleanup
        * CHECK: catch{{.*}}i8**{{.*}}@_ZTIc
        * CHECK: filter{{.*}}@_ZTIPKc{{.*}}@_ZTId
        * CHECK: resume
        * *)
   end;
 
   group "br"; begin
let test_builder () =
   end;
 
   group "memory"; begin
     let bb08 = append_block context "Bb08" fn in
     let b = builder_at_end context bb08 in
 
     (* CHECK: %build_alloca = alloca i32
      * CHECK: %build_array_alloca = alloca i32, i32 %P2
-     * CHECK: %build_load = load volatile i32* %build_array_alloca, align 4
+     * CHECK: %build_load = load volatile i32, i32* %build_array_alloca, align 4
      * CHECK: store volatile i32 %P2, i32* %build_alloca, align 4
-     * CHECK: %build_gep = getelementptr i32* %build_array_alloca, i32 %P2
-     * CHECK: %build_in_bounds_gep = getelementptr inbounds i32* %build_array_alloca, i32 %P2
+     * CHECK: %build_gep = getelementptr i32, i32* %build_array_alloca, i32 %P2
+     * CHECK: %build_in_bounds_gep = getelementptr inbounds i32, i32* %build_array_alloca, i32 %P2
      * CHECK: %build_struct_gep = getelementptr inbounds{{.*}}%build_alloca2, i32 0, i32 1
      * CHECK: %build_atomicrmw = atomicrmw xchg i8* %p, i8 42 seq_cst
      *)
     let alloca = build_alloca i32_type "build_alloca" b in
     let array_alloca = build_array_alloca i32_type p2 "build_array_alloca" b in
 
     let load = build_load array_alloca "build_load" b in
     ignore(set_alignment 4 load);
group "phi"; begin
     ignore (build_unreachable at_jb);
   end
 
 (* End-of-file checks for things like metdata and attributes.
  * CHECK: attributes #0 = {{.*}}uwtable{{.*}}
  * CHECK: !llvm.module.flags = !{!0}
  * CHECK: !0 = !{i32 1, !"Debug Info Version", i32 3}
  * CHECK: !1 = !{i32 1, !"metadata test"}
- * CHECK: !2 = !DILocation(line: 2, column: 3, scope: !3, inlinedAt: !3)
  *)
 
 (*===-- Pass Managers -----------------------------------------------------===*)
 
 let test_pass_manager () =
   let (++) x f = ignore (f x); x in
 
   begin group "module pass manager";

llvm/trunk/test/Bindings/OCaml/lit.local.cfg

 config.suffixes = ['.ml']
 
-# Temporarily disable the tests for the OCaml bindings until they're updated.
-config.unsupported = True
-
 if not 'ocaml' in config.root.llvm_bindings:
     config.unsupported = True
 
 if config.root.have_ocaml_ounit not in ('1', 'TRUE'):
     config.unsupported = True