From 6483605e9bea9dfb823934f4f8c8e89bd7977d4c Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sat, 16 Jun 2018 12:31:22 +0000
Subject: Remove Canary.

This eliminates 3 uses of Obj from TCB.
---
 kernel/names.ml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'kernel')

diff --git a/kernel/names.ml b/kernel/names.ml
index 597061278..1d2a7c4ce 100644
--- a/kernel/names.ml
+++ b/kernel/names.ml
@@ -17,7 +17,7 @@
    the module system, Aug 2002 *)
 (* Abstraction over the type of constant for module inlining by Claudio
    Sacerdoti, Nov 2004 *)
-(* Miscellaneous features or improvements by Hugo Herbelin, 
+(* Miscellaneous features or improvements by Hugo Herbelin,
    Élie Soubiran, ... *)
 
 open Pp
@@ -364,7 +364,6 @@ module MPmap = CMap.Make(ModPath)
 module KerName = struct
 
   type t = {
-    canary : Canary.t;
     modpath : ModPath.t;
     dirpath : DirPath.t;
     knlabel : Label.t;
@@ -372,16 +371,14 @@ module KerName = struct
     (** Lazily computed hash. If unset, it is set to negative values. *)
   }
 
-  let canary = Canary.obj
-
   type kernel_name = t
 
   let make modpath dirpath knlabel =
-    { modpath; dirpath; knlabel; refhash = -1; canary; }
+    { modpath; dirpath; knlabel; refhash = -1; }
   let repr kn = (kn.modpath, kn.dirpath, kn.knlabel)
 
   let make2 modpath knlabel =
-    { modpath; dirpath = DirPath.empty; knlabel; refhash = -1; canary; }
+    { modpath; dirpath = DirPath.empty; knlabel; refhash = -1; }
 
   let modpath kn = kn.modpath
   let label kn = kn.knlabel
@@ -437,7 +434,7 @@ module KerName = struct
         * (string -> string)
     let hashcons (hmod,hdir,hstr) kn =
       let { modpath = mp; dirpath = dp; knlabel = l; refhash; } = kn in
-      { modpath = hmod mp; dirpath = hdir dp; knlabel = hstr l; refhash; canary; }
+      { modpath = hmod mp; dirpath = hdir dp; knlabel = hstr l; refhash; }
     let eq kn1 kn2 =
       kn1.modpath == kn2.modpath && kn1.dirpath == kn2.dirpath &&
         kn1.knlabel == kn2.knlabel
-- 
cgit v1.2.3