misc

tools/dumpobj.ml

@@ -25,7 +25,7 @@ open Printf
 
 let print_banners = ref true
 let print_locations = ref true
-let print_reloc_info = ref true
+let print_reloc_info = ref false
 
 (* Read signed and unsigned integers *)
 
@@ -78,7 +78,7 @@ let record_events orig evl =
 let same_custom x y =
   Nativeint.equal (Obj.raw_field x 0) (Obj.raw_field (Obj.repr y) 0)
 
-external is_null : Obj.t -> bool = "caml_is_null"
+external is_null : Obj.t -> bool = "%is_null"
 
 let rec print_obj x =
   if is_null x then

toplevel/genprintval.ml

@@ -75,7 +75,7 @@ module Make(O : OBJ)(EVP : EVALPATH with type valu = O.t) = struct
 
     type t = O.t
 
-    external is_null : O.t -> bool = "caml_is_null"
+    external is_null : O.t -> bool = "%is_null"
 
     module ObjTbl = Hashtbl.Make(struct
         type t = O.t
@@ -443,8 +443,10 @@ module Make(O : OBJ)(EVP : EVALPATH with type valu = O.t) = struct
                           constr_list, cstr_arg_jkinds
                       with
                       | Datarepr.Constr_not_found | Not_found -> 
+                        (* If a [Variant_with_null] is not a [Null],
+                            it's guaranteed to be [This value]. *)
                         match rep with
-                        | Variant_with_null -> List.hd (List.tl constr_list),
+                        | Variant_with_null -> List.nth constr_list 1,
                           [| Jkind.Builtin.value ~why:(Type_argument {
                             parent_path = path;
                             position = 1;