Commit b681f029 authored by Robbert Krebbers's avatar Robbert Krebbers

Test merge_sbi_new.

parent 1b5e892f
Pipeline #28536 passed with stage
in 35 minutes
......@@ -27,24 +27,10 @@ variables:
## Build jobs
build-coq.8.11.0:
build-iris.dev:
<<: *template
variables:
OPAM_PINS: "coq version 8.11.0"
OPAM_PINS: "coq version 8.11.0 coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#ci/robbert/merge_sbi_new coq-gpfsl.dev git git+https://gitlab.mpi-sws.org/iris/gpfsl.git#ci/robbert/merge_sbi_new"
tags:
- fp-timing
build-coq.8.10.2:
<<: *template
variables:
OPAM_PINS: "coq version 8.10.2"
build-iris.dev:
<<: *template
variables:
OPAM_PINS: "coq version dev coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#$IRIS_REV coq-orc11.dev git git+https://gitlab.mpi-sws.org/iris/orc11.git#$ORC11_REV coq-gpfsl.dev git git+https://gitlab.mpi-sws.org/iris/gpfsl.git#$GPFSL_REV"
except:
only:
- triggers
- schedules
- api
......@@ -126,7 +126,7 @@ Section frac_bor.
destruct (Qp_lower_bound (qκ'/2) (qφ0/2)) as (qq & qκ'0 & qφ0' & Hqκ' & Hqφ).
iExists qq.
iAssert ( φ qq ⎡▷ φ' (qφ0' + qφ0 / 2) V0)%Qp%I with "[Hφ0]" as "[$ Hqφ]".
{ rewrite -{1}(Qp_div_2 qφ0) {1}Hqφ -assoc_L embed_later -bi.later_sep. iNext.
{ rewrite -{1}(Qp_div_2 qφ0) {1}Hqφ -assoc_L !embed_later -bi.later_sep. iNext.
iDestruct ("Hfrac" with "Hφ0") as "[Hφ0 $]". iApply "Hφ'".
by iApply (monPred_in_elim with "HV0"). }
iAssert ( own γ qq
......
......@@ -28,7 +28,7 @@ Module Type lifetime_sig.
Section defs.
Context {Σ : gFunctors} {Lat}.
Notation monPred := (monPredSI (lat_bi_index Lat) (uPredSI (iResUR Σ))).
Notation monPred := (monPredI (lat_bi_index Lat) (uPredI (iResUR Σ))).
Parameter lft_ctx : `{!invG Σ, !lftG Lat E0 Σ}, iProp Σ.
......
......@@ -24,7 +24,7 @@ Proof. solve_inG. Qed.
Section box_defs.
Context `{invG Σ, boxG Lat Σ} (N : namespace).
Notation iProp := (iProp Σ).
Notation monPred := (monPred (lat_bi_index Lat) (uPredSI (iResUR Σ))).
Notation monPred := (monPred (lat_bi_index Lat) (uPredI (iResUR Σ))).
Definition slice_name := gname.
......@@ -56,7 +56,7 @@ Instance: Params (@box) 6 := {}.
Section box.
Context `{invG Σ, boxG Lat Σ} (N : namespace).
Notation monPred := (monPred (lat_bi_index Lat) (uPredSI (iResUR Σ))).
Notation monPred := (monPred (lat_bi_index Lat) (uPredI (iResUR Σ))).
Implicit Types P Q : monPred.
Global Instance box_own_prop_ne γ : NonExpansive (box_own_prop γ).
......
......@@ -87,7 +87,7 @@ Section defs.
Context {Σ Lat} `{!invG Σ, !lftG Lat E0 Σ}.
Notation iProp := (iProp Σ).
Notation monPred := (monPredSI (lat_bi_index Lat) (uPredSI (iResUR Σ))).
Notation monPred := (monPred (lat_bi_index Lat) (uPredI (iResUR Σ))).
Definition lft_tok (q : Qp) (κ : lft) : monPred :=
([ mset] Λ κ, V, monPred_in V
......@@ -241,7 +241,7 @@ Context `{!invG Σ, !lftG Lat E0 Σ}.
Implicit Types κ : lft.
Notation iProp := (iProp Σ).
Notation monPred := (monPred (lat_bi_index Lat) (uPredSI (iResUR Σ))).
Notation monPred := (monPred (lat_bi_index Lat) (uPredI (iResUR Σ))).
(* Unfolding lemmas *)
Lemma lft_vs_inv_go_ne κ (f f' : κ', κ' κ monPred) Vs I n :
......
......@@ -216,7 +216,7 @@ Section rwlock_inv.
Proof.
move => ???.
apply bi.sep_ne; [|apply bi.sep_ne]; [..|done];
apply bi.later_contractive; (destruct n; [done|]);
f_contractive;
apply bi.intuitionistically_ne.
- apply bi.iff_ne; [done|]. apply bi.exist_ne => ?.
apply bi.sep_ne; [done|by apply ty_own_type_dist].
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment