diff options
| author | Pierre-Marie Pédrot | 2021-04-20 11:19:26 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2021-04-20 11:19:26 +0200 |
| commit | cab7a5ddb906e5cef57d78ba7435e89354f3125b (patch) | |
| tree | 8f3f80825980f2bbb3e25d713477b7fbaa1599af /plugins | |
| parent | b36fb9f68884090e5b06f9837da084395f519f96 (diff) | |
| parent | e50a6195097c0d15c839c5403c1d02511afd54e4 (diff) | |
Merge PR #14131: Check for existence before using `Global.lookup_constant` instead of catching `Not_found`
Reviewed-by: ppedrot
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/extraction/mlutil.ml | 3 | ||||
| -rw-r--r-- | plugins/funind/gen_principle.ml | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/plugins/extraction/mlutil.ml b/plugins/extraction/mlutil.ml index cfdaac710b..268d4bf9e9 100644 --- a/plugins/extraction/mlutil.ml +++ b/plugins/extraction/mlutil.ml @@ -1525,8 +1525,7 @@ let inline_test r t = else let c = match r with GlobRef.ConstRef c -> c | _ -> assert false in let has_body = - try constant_has_body (Global.lookup_constant c) - with Not_found -> false + Environ.mem_constant c (Global.env()) && constant_has_body (Global.lookup_constant c) in has_body && (let t1 = eta_red t in diff --git a/plugins/funind/gen_principle.ml b/plugins/funind/gen_principle.ml index cbdebb7bbc..6236a5147d 100644 --- a/plugins/funind/gen_principle.ml +++ b/plugins/funind/gen_principle.ml @@ -2058,13 +2058,12 @@ let make_graph (f_ref : GlobRef.t) = let sigma = Evd.from_env env in let c, c_body = match f_ref with - | GlobRef.ConstRef c -> ( - try (c, Global.lookup_constant c) - with Not_found -> + | GlobRef.ConstRef c -> + if Environ.mem_constant c (Global.env ()) then (c, Global.lookup_constant c) else CErrors.user_err Pp.( str "Cannot find " - ++ Printer.pr_leconstr_env env sigma (EConstr.mkConst c)) ) + ++ Printer.pr_leconstr_env env sigma (EConstr.mkConst c)) | _ -> CErrors.user_err Pp.(str "Not a function reference") in match Global.body_of_constant_body Library.indirect_accessor c_body with |