Skip to content

Fix HC collisions. #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strub merged 1 commit into from
Mar 7, 2025
Merged

Fix HC collisions. #739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/ecAst.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,8 @@ module Hexpr = Why3.Hashcons.Make (struct
in
Why3.Hashcons.combine_list b1_hash 0 bs

let hash e =
match e.e_node with
let hash_node (e : expr_node) =
match e with
| Eint i -> BI.hash i
| Elocal x -> Hashtbl.hash x
| Evar x -> pv_hash x
Expand Down Expand Up @@ -889,6 +889,9 @@ module Hexpr = Why3.Hashcons.Make (struct
| Eproj (e, i) ->
Why3.Hashcons.combine (e_hash e) i

let hash (e : expr) =
Why3.Hashcons.combine (ty_hash e.e_ty) (hash_node e.e_node)

let fv_node e =
let union ex =
List.fold_left (fun s e -> fv_union s (ex e)) Mid.empty
Expand Down Expand Up @@ -980,8 +983,8 @@ module Hsform = Why3.Hashcons.Make (struct
ty_equal f1.f_ty f2.f_ty
&& equal_node f1.f_node f2.f_node

let hash f =
match f.f_node with
let hash_node (f : f_node) =
match f with
| Fquant(q, b, f) ->
Why3.Hashcons.combine2 (f_hash f) (b_hash b) (qt_hash q)

Expand Down Expand Up @@ -1028,6 +1031,9 @@ module Hsform = Why3.Hashcons.Make (struct
| FeagerF eg -> eg_hash eg
| Fpr pr -> pr_hash pr

let hash (f : form) =
Why3.Hashcons.combine (ty_hash f.f_ty) (hash_node f.f_node)

let fv_mlr = Sid.add mleft (Sid.singleton mright)

let fv_node f =
Expand Down