aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2018-04-09 15:57:58 +0200
committerGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2018-04-09 15:57:58 +0200
commitf9ef634e94c667641a9da12fa2b9f8e585d6d5c6 (patch)
tree469ec787483efde36b699fd54fb1ba225c57c76a
parent894c970093c2ac3abd5581d9df7bd424fcd577ba (diff)
parente739f16b0792545ec210008cdd6264614fe695e4 (diff)
Merge PR #7103: Fix #7101: STM delegation policy broken
# Conflicts: # CHANGES
-rw-r--r--CHANGES9
-rw-r--r--lib/aux_file.ml2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3994caef6..234d6c0db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,15 @@ Tactic language
- Ltac backtraces now contain include trace information about tactics
called by OCaml-defined tactics.
+Changes from 8.8+beta1 to 8.8.0
+===============================
+
+Tools
+
+- Asynchronous proof delegation policy was fixed. Since version 8.7
+ Coq was ignoring previous runs and the -async-proofs-delegation-threshold
+ option did not have the expected behavior.
+
Changes from 8.7.2 to 8.8+beta1
===============================
diff --git a/lib/aux_file.ml b/lib/aux_file.ml
index 7d9c528e7..0f9476605 100644
--- a/lib/aux_file.ml
+++ b/lib/aux_file.ml
@@ -55,7 +55,7 @@ let record_in_aux_at ?loc key v =
match loc with
| Some loc -> let i, j = Loc.unloc loc in
Printf.fprintf oc "%d %d %s %S\n" i j key v
- | None -> Printf.fprintf oc "--- %s %S\n" key v
+ | None -> Printf.fprintf oc "0 0 %s %S\n" key v
) !oc
let current_loc : Loc.t option ref = ref None