diff options
| author | Matthieu Sozeau | 2016-07-07 15:42:48 +0200 |
|---|---|---|
| committer | Matthieu Sozeau | 2016-07-07 15:42:48 +0200 |
| commit | 11e788c86f1354bd727b2c6c01bc90d431e09188 (patch) | |
| tree | d9f24bc29c91dbeeb608cf0dc2d191ff2b95290a /toplevel | |
| parent | d0afde58b3320b65fc755cca5600af3b1bc9fa82 (diff) | |
| parent | 2d06b0d8ed38a2c7bc819b418af070cfe865a1d8 (diff) | |
Merge remote-tracking branch 'github/bug4873' into v8.6
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/obligations.ml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/toplevel/obligations.ml b/toplevel/obligations.ml index 1f1be243e8..29d7457321 100644 --- a/toplevel/obligations.ml +++ b/toplevel/obligations.ml @@ -858,18 +858,17 @@ let obligation_terminator name num guard hook auto pf = in let obl = { obl with obl_status = false, status } in let uctx = Evd.evar_context_universe_context ctx in - let (def, obl) = declare_obligation prg obl body ty uctx in + let (_, obl) = declare_obligation prg obl body ty uctx in let obls = Array.copy obls in let _ = obls.(num) <- obl in try ignore (update_obls prg obls (pred rem)); - if def then - if pred rem > 0 then - begin - let deps = dependencies obls num in - if not (Int.Set.is_empty deps) then + if pred rem > 0 then + begin + let deps = dependencies obls num in + if not (Int.Set.is_empty deps) then ignore (auto (Some name) None deps) - end + end with e when CErrors.noncritical e -> let e = CErrors.push e in pperror (CErrors.iprint (ExplainErr.process_vernac_interp_error e)) |
