aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Dénès2019-12-13 10:47:05 +0100
committerMaxime Dénès2019-12-13 10:47:05 +0100
commita07480b5150d23b89a2a9acc09c8e506db9e73da (patch)
tree7ec5ab62f609e085c1e9f4ff51cf5a4b1112484e
parentdcbfdb7356e4f0a02ad10feb211a9952ae2dc8ba (diff)
parentccae6b2053970a0bd587bb48c2d30fc235de4118 (diff)
Merge PR #10657: restrict minimization to set to flexibles
Reviewed-by: mattam82
-rw-r--r--doc/changelog/02-specification-language/10657-minim-toset-flex.rst3
-rw-r--r--engine/univMinim.ml2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/changelog/02-specification-language/10657-minim-toset-flex.rst b/doc/changelog/02-specification-language/10657-minim-toset-flex.rst
new file mode 100644
index 0000000000..8983e162fb
--- /dev/null
+++ b/doc/changelog/02-specification-language/10657-minim-toset-flex.rst
@@ -0,0 +1,3 @@
+- Changed heuristics for universe minimization to :g:`Set`: only
+ minimize flexible universes (`#10657 <https://github.com/coq/coq/pull/10657>`_,
+ by Gaëtan Gilbert with help from Maxime Dénès and Matthieu Sozeau).
diff --git a/engine/univMinim.ml b/engine/univMinim.ml
index 30fdd28997..fc0770cf75 100644
--- a/engine/univMinim.ml
+++ b/engine/univMinim.ml
@@ -276,7 +276,7 @@ let normalize_context_set ~lbound g ctx us algs weak =
Constraint.partition (fun (l,d,r) -> d == Le && (Level.equal l lbound || Level.is_sprop l)) csts
in
let smallles = if get_set_minimization ()
- then Constraint.filter (fun (l,d,r) -> LSet.mem r ctx && not (Level.is_sprop l)) smallles
+ then Constraint.filter (fun (l,d,r) -> LMap.mem r us && not (Level.is_sprop l)) smallles
else Constraint.empty
in
let csts, partition =