diff options
| author | Pierre-Marie Pédrot | 2019-04-02 18:38:06 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2019-04-02 18:38:06 +0200 |
| commit | 97edaec1d6df277da0e44d9b99abc2fdd309bfd6 (patch) | |
| tree | 4442af9250415a203a2b137ce87b0f989e442e80 /pretyping | |
| parent | 974dc811fe30a762235b68fb3c0ac5c3eeca45b9 (diff) | |
| parent | 388ed80af0826997718565c8101105b372e99fa8 (diff) | |
Merge PR #8984: Declare initial hint databases in prelude
Ack-by: JasonGross
Reviewed-by: ppedrot
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/pretyping.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index bec939b911..a6e3cfe085 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -266,8 +266,8 @@ let apply_inference_hook hook env sigma frozen = match frozen with let apply_heuristics env sigma fail_evar = (* Resolve eagerly, potentially making wrong choices *) - try solve_unif_constraints_with_heuristics - ~flags:(default_flags_of (Typeclasses.classes_transparent_state ())) env sigma + let flags = default_flags_of (Typeclasses.classes_transparent_state ()) in + try solve_unif_constraints_with_heuristics ~flags env sigma with e when CErrors.noncritical e -> let e = CErrors.push e in if fail_evar then iraise e else sigma |