diff options
| author | Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr> | 2021-03-23 19:12:19 +0100 |
|---|---|---|
| committer | Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr> | 2021-03-23 19:12:19 +0100 |
| commit | dcb523736e82d72b03fa8d055bf74472dba7345c (patch) | |
| tree | 71e797c92d45dca509527043d233c51b2ed8fc86 /lib/UnionFind.v | |
| parent | 3e953ef41f736ed5b7db699b1adf21d46cb5b8db (diff) | |
| parent | 6bf310dd678285dc193798e89fc2c441d8430892 (diff) | |
| download | compcert-kvx-dcb523736e82d72b03fa8d055bf74472dba7345c.tar.gz compcert-kvx-dcb523736e82d72b03fa8d055bf74472dba7345c.zip | |
Merge branch 'master' into merge_master_8.13.1
PARTIAL MERGE (PARTLY BROKEN).
See unsolved conflicts in: aarch64/TO_MERGE and riscV/TO_MERGE
WARNING:
interface of va_args and assembly sections have changed
Diffstat (limited to 'lib/UnionFind.v')
| -rw-r--r-- | lib/UnionFind.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/UnionFind.v b/lib/UnionFind.v index bd1b763b..ae2c30d2 100644 --- a/lib/UnionFind.v +++ b/lib/UnionFind.v @@ -563,10 +563,10 @@ Proof. destruct (M.elt_eq x0 (repr uf a)). - rewrite e, repr_canonical, dec_eq_true. inversion G. subst x'. rewrite dec_eq_false; auto. - replace (pathlen uf (repr uf a)) with 0; try omega. + replace (pathlen uf (repr uf a)) with 0; try lia. symmetry. apply pathlen_none. apply repr_res_none. - rewrite (repr_unroll uf x0), (pathlen_unroll uf x0), G. - destruct (M.elt_eq (repr uf x') (repr uf a)); omega. + destruct (M.elt_eq (repr uf x') (repr uf a)); lia. + clear H; simpl in G. rewrite M.gsspec in G. destruct (M.elt_eq x0 (repr uf a)); try discriminate. rewrite (repr_none uf x0) by auto. rewrite dec_eq_false; auto. symmetry. apply pathlen_zero; auto. apply repr_none; auto. @@ -595,7 +595,7 @@ Proof. - inversion G; clear G. subst. rewrite !repr_canonical, dec_eq_true. rewrite dec_eq_false; auto. - rewrite LENa. rewrite (pathlen_none uf (repr uf b)); try omega. + rewrite LENa. rewrite (pathlen_none uf (repr uf b)); try lia. apply repr_res_none. - rewrite (repr_unroll uf x0), G, ! (pathlen_some _ _ _ G). destruct (M.elt_eq _ _); auto. @@ -613,7 +613,7 @@ Proof. intros. repeat rewrite pathlen_merge. destruct (M.elt_eq (repr uf a) (repr uf b)). auto. rewrite H. destruct (M.elt_eq (repr uf y) (repr uf a)). - omega. auto. + lia. auto. Qed. (* Path compression *) |