From a1bdaf0635b5d5b9e007662f324dd526ba0fe8d3 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Tue, 9 Oct 2018 18:21:04 +0200
Subject: [checker] Refactor by sharing code with the kernel

For historical reasons, the checker was duplicating a lot of code of the
kernel. The main differences I found were bug fixes that had not been
backported.

With this patch, the checker uses the kernel as a library to serve the
same purpose as before: validation of a `.vo` file, re-typechecking all
definitions a posteriori.

We also rename some files from the checker so that they don't clash with
kernel files.
---
 checker/safe_checking.ml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 checker/safe_checking.ml

(limited to 'checker/safe_checking.ml')

diff --git a/checker/safe_checking.ml b/checker/safe_checking.ml
new file mode 100644
index 0000000000..90b5188d26
--- /dev/null
+++ b/checker/safe_checking.ml
@@ -0,0 +1,22 @@
+(************************************************************************)
+(*         *   The Coq Proof Assistant / The Coq Development Team       *)
+(*  v      *   INRIA, CNRS and contributors - Copyright 1999-2018       *)
+(* <O___,, *       (see CREDITS file for the list of authors)           *)
+(*   \VV/  **************************************************************)
+(*    //   *    This file is distributed under the terms of the         *)
+(*         *     GNU Lesser General Public License Version 2.1          *)
+(*         *     (see LICENSE file for the text of the license)         *)
+(************************************************************************)
+
+open Declarations
+open Environ
+
+let import clib univs digest =
+  let mb = Safe_typing.module_of_library clib in
+  let env = push_context_set ~strict:true mb.mod_constraints (Global.env ())  in
+  let env = push_context_set ~strict:true univs env in
+  Mod_checking.check_module env mb.mod_mp mb;
+  let _ = Global.import clib univs digest in ()
+
+let unsafe_import clib univs digest =
+  let _ = Global.import clib univs digest in ()
-- 
cgit v1.2.3


From 4b391bd039e93124e2b919161fbcfc495119c77a Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Wed, 31 Oct 2018 19:10:50 +0100
Subject: Checker now disables VM and native

At the same time, we made the safe_env threading explicit.
---
 checker/safe_checking.ml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'checker/safe_checking.ml')

diff --git a/checker/safe_checking.ml b/checker/safe_checking.ml
index 90b5188d26..6dc2953060 100644
--- a/checker/safe_checking.ml
+++ b/checker/safe_checking.ml
@@ -11,12 +11,13 @@
 open Declarations
 open Environ
 
-let import clib univs digest =
+let import senv clib univs digest =
   let mb = Safe_typing.module_of_library clib in
-  let env = push_context_set ~strict:true mb.mod_constraints (Global.env ())  in
+  let env = Safe_typing.env_of_safe_env senv in
+  let env = push_context_set ~strict:true mb.mod_constraints env in
   let env = push_context_set ~strict:true univs env in
   Mod_checking.check_module env mb.mod_mp mb;
-  let _ = Global.import clib univs digest in ()
+  let (_,senv) = Safe_typing.import clib univs digest senv in senv
 
-let unsafe_import clib univs digest =
-  let _ = Global.import clib univs digest in ()
+let unsafe_import senv clib univs digest =
+  let (_,senv) = Safe_typing.import clib univs digest senv in senv
-- 
cgit v1.2.3