Skip to content

Stdpp 1.7.0 #11

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

Open
swils wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Stdpp 1.7.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
862759a
Port to Coq 8.15 and stdpp 1.7 (not backwards compatible due to renames)
swils Feb 9, 2022
48625f8
Updated the README file.
swils Feb 9, 2022
210ee5a
A proper solution for the TC resolution problem with frozen (thx Robb…
swils Feb 9, 2022
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
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This version is known to compile with:
- OCaml-Num 1.4.2
- OCamlbuild 0.14.0
- GNU C preprocessor 8.3.0
- stdpp 1.6.0
- stdpp 1.7.0

BUILDING INSTRUCTIONS
---------------------
Expand Down
2 changes: 1 addition & 1 deletion memory/memory_map.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Proof.
destruct (m !!{Γ} (_, addr_ref _ _)) as [w'|] eqn:?; simplify_equality'.
erewrite cmap_lookup_ref_le
by eauto using cmap_lookup_ref_le, ref_freeze_le_r; simpl.
by rewrite (decide_iff _ _ _ _ (addr_is_obj_freeze _ _)).
by rewrite (decide_ext _ _ _ _ (addr_is_obj_freeze _ _)).
Qed.
Lemma cmap_lookup_ref_Some Γ Δ m o r w :
✓ Γ → ✓{Γ,Δ} m → m !!{Γ} (o,r) = Some w →
Expand Down
2 changes: 1 addition & 1 deletion memory/pointer_bits.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Proof.
| inleft (τ↾Hτ) => cast_if_and (decide (frozen (frag_item pb)))
(decide (frag_index pb < bit_size_of (ΓΔ.1) (τ.*)))
| inright Hτ => right _
end; unfold frozen; auto with typeclass_instances;
end;
destruct ΓΔ; first
[ simplify_type_equality; econstructor; eauto
| by destruct 1 as (?&?&?&?); simplify_type_equality ].
Expand Down
5 changes: 4 additions & 1 deletion memory/references.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,11 @@ Inductive ref_typed' `{Env K} (Γ : env K) :

Class Freeze A := freeze: bool → A → A.
Arguments freeze {_ _} _ !_ /.

Definition frozen `{Freeze A} (x : A) := freeze true x = x.
Arguments freeze {_ _} _ !_ /.
#[global] Typeclasses Opaque frozen.
#[global] Instance frozen_dec `{EqDecision A, Freeze A} (x : A) :
Decision (frozen x) := decide (freeze true x = x).

#[global] Instance ref_seg_freeze {K} : Freeze (ref_seg K) := λ β rs,
match rs with
Expand Down
2 changes: 1 addition & 1 deletion refinements/operations_refine.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Lemma addr_compare_refine Γ α f m1 m2 c a1 a2 a3 a4 σp :
a1 ⊑{Γ,α,f@'{m1}↦'{m2}} a2 : σp → a3 ⊑{Γ,α,f@'{m1}↦'{m2}} a4 : σp →
addr_compare Γ c a1 a3 = addr_compare Γ c a2 a4.
Proof.
intros ? (_&_&Hstrict) Ha1 Ha2; unfold addr_compare; apply bool_decide_iff.
intros ? (_&_&Hstrict) Ha1 Ha2; unfold addr_compare; apply bool_decide_ext.
assert ('{m1} ⊑{Γ,α,f} '{m2}) as HΔ by eauto using addr_refine_memenv_refine.
destruct (addr_object_offset_refine Γ α f
'{m1} '{m2} a1 a2 σp) as (r1&?&?&->); auto.
Expand Down