From b8b835cbb7ce5fa12a60184fd83fbde2082d51b3 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Pédrot
Date: Thu, 21 Nov 2019 09:23:47 +0100
Subject: Use the relevance flag in CClosure rel contexts in an efficient way.

Rels that exist inside the environment at the time of the closure creation
are fetched in the global environment, while we only use the local list of
relevance for FRels. All the infrastructure was implicitly relying on this
kind of behaviour before the introduction of SProp.

Fixes #11150: pattern is 10x slower in Coq 8.10.0
---
 pretyping/retyping.ml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'pretyping')

diff --git a/pretyping/retyping.ml b/pretyping/retyping.ml
index f089b242a2..d2af957b54 100644
--- a/pretyping/retyping.ml
+++ b/pretyping/retyping.ml
@@ -264,16 +264,19 @@ let relevance_of_term env sigma c =
   if Environ.sprop_allowed env then
     let rec aux rels c =
       match kind sigma c with
-      | Rel n -> Retypeops.relevance_of_rel_extra env rels n
+      | Rel n ->
+        let len = Range.length rels in
+        if n <= len then Range.get rels (n - 1)
+        else Retypeops.relevance_of_rel env (n - len)
       | Var x -> Retypeops.relevance_of_var env x
       | Sort _ -> Sorts.Relevant
       | Cast (c, _, _) -> aux rels c
       | Prod ({binder_relevance=r}, _, codom) ->
-        aux (r::rels) codom
+        aux (Range.cons r rels) codom
       | Lambda ({binder_relevance=r}, _, bdy) ->
-        aux (r::rels) bdy
+        aux (Range.cons r rels) bdy
       | LetIn ({binder_relevance=r}, _, _, bdy) ->
-        aux (r::rels) bdy
+        aux (Range.cons r rels) bdy
       | App (c, _) -> aux rels c
       | Const (c,_) -> Retypeops.relevance_of_constant env c
       | Ind _ -> Sorts.Relevant
@@ -287,7 +290,7 @@ let relevance_of_term env sigma c =
       | Meta _ | Evar _ -> Sorts.Relevant
 
     in
-    aux [] c
+    aux Range.empty c
   else Sorts.Relevant
 
 let relevance_of_type env sigma t =
-- 
cgit v1.2.3