Merge PR #989: Prevent overallocation in Array.map_to_list and remove custom implementation from Detyping.

1 files changed, 1 insertions, 10 deletions

diff --git a/pretyping/detyping.ml b/pretyping/detyping.ml
index a27debe735..b9cb7ba1b1 100644
--- a/pretyping/detyping.ml
+++ b/pretyping/detyping.ml
@@ -476,7 +476,7 @@ let rec detype flags avoid env sigma t = CAst.make @@
  	| _ -> GApp (f',args')
       in
       mkapp (detype flags avoid env sigma f)
-        (detype_array flags avoid env sigma args)
+        (Array.map_to_list (detype flags avoid env sigma) args)
     | Const (sp,u) -> GRef (ConstRef sp, detype_instance sigma u)
     | Proj (p,c) ->
       let noparams () = 
@@ -694,15 +694,6 @@ and detype_binder (lax,isgoal as flags) bk avoid env sigma na body ty c =
       let t = if s != InProp  && not !Flags.raw_print then None else Some (detype (lax,false) avoid env sigma ty) in
       GLetIn (na', c, t, r)
 
-(** We use a dedicated function here to prevent overallocation from
-    Array.map_to_list. *)
-and detype_array flags avoid env sigma args =
-  let ans = ref [] in
-  for i = Array.length args - 1 downto 0 do
-    ans := detype flags avoid env sigma args.(i) :: !ans;
-  done;
-  !ans
-
 let detype_rel_context ?(lax=false) where avoid env sigma sign =
   let where = Option.map (fun c -> EConstr.it_mkLambda_or_LetIn c sign) where in
   let rec aux avoid env = function