From ee5c3774806f86caab8e5c3fe45ed19512f49819 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Wed, 12 Feb 2020 10:22:59 +0100
Subject: [exn] Keep information from multiple extra exn handlers

This fixes #11547 ; note that it is hard to register such handlers in
the `Summary` due to layering issues; there are potential anomalies here
depending on how plugins do register their data structures.
---
 plugins/ltac/tactic_debug.ml  | 4 ++--
 plugins/ltac/tactic_debug.mli | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/ltac/tactic_debug.ml b/plugins/ltac/tactic_debug.ml
index 392f9b2ffd..3512bb936d 100644
--- a/plugins/ltac/tactic_debug.ml
+++ b/plugins/ltac/tactic_debug.ml
@@ -418,7 +418,7 @@ let extract_ltac_trace ?loc trace =
     (* We entered a user-defined tactic,
        we display the trace with location of the call *)
     let msg = hov 0 (explain_ltac_call_trace c tail loc ++ fnl()) in
-    (if Loc.finer loc tloc then loc else tloc), Some msg
+    (if Loc.finer loc tloc then loc else tloc), msg
   else
     (* We entered a primitive tactic, we don't display trace but
        report on the finest location *)
@@ -434,7 +434,7 @@ let extract_ltac_trace ?loc trace =
              aux best_loc tail
         | [] -> best_loc in
         aux loc trace in
-    best_loc, None
+    best_loc, mt ()
 
 let get_ltac_trace info =
   let ltac_trace = Exninfo.get info ltac_trace_info in
diff --git a/plugins/ltac/tactic_debug.mli b/plugins/ltac/tactic_debug.mli
index e0126ad448..c76851a14c 100644
--- a/plugins/ltac/tactic_debug.mli
+++ b/plugins/ltac/tactic_debug.mli
@@ -79,4 +79,4 @@ val db_breakpoint : debug_info ->
   lident message_token list -> unit Proofview.NonLogical.t
 
 val extract_ltac_trace :
-  ?loc:Loc.t -> Tacexpr.ltac_trace -> Pp.t option Loc.located
+  ?loc:Loc.t -> Tacexpr.ltac_trace -> Pp.t Loc.located
-- 
cgit v1.2.3