Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gaëtan Gilbert
Iris
Commits
50b368c0
Commit
50b368c0
authored
5 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
note a few places where we had to use ssreflect to force the use unification algorithm
parent
0a05a8c0
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
theories/base_logic/lib/proph_map.v
+4
-5
4 additions, 5 deletions
theories/base_logic/lib/proph_map.v
theories/heap_lang/lib/counter.v
+3
-2
3 additions, 2 deletions
theories/heap_lang/lib/counter.v
theories/program_logic/ownp.v
+2
-2
2 additions, 2 deletions
theories/program_logic/ownp.v
with
9 additions
and
9 deletions
theories/base_logic/lib/proph_map.v
+
4
−
5
View file @
50b368c0
...
@@ -134,10 +134,8 @@ Section proph_map.
...
@@ -134,10 +134,8 @@ Section proph_map.
rewrite
proph_eq
/
proph_def
.
iIntros
"Hp1 Hp2"
.
rewrite
proph_eq
/
proph_def
.
iIntros
"Hp1 Hp2"
.
iCombine
"Hp1 Hp2"
as
"Hp"
.
iCombine
"Hp1 Hp2"
as
"Hp"
.
iDestruct
(
own_valid
with
"Hp"
)
as
%
Hp
.
iDestruct
(
own_valid
with
"Hp"
)
as
%
Hp
.
(* FIXME: [apply auth_frag_valid in Hp] and
(* FIXME: FIXME(Coq #6294): needs new unification *)
[rewrite ->auth_frag_valid in Hp] both should work but do not. *)
move
:
Hp
.
rewrite
auth_frag_valid
singleton_valid
//.
move
:
Hp
.
rewrite
auth_frag_valid
singleton_valid
=>
Hp
.
done
.
Qed
.
Qed
.
Lemma
proph_map_new_proph
p
ps
pvs
:
Lemma
proph_map_new_proph
p
ps
pvs
:
...
@@ -169,7 +167,8 @@ Section proph_map.
...
@@ -169,7 +167,8 @@ Section proph_map.
assert
(
vs
=
v
::
proph_list_resolves
pvs
p
)
as
->
.
assert
(
vs
=
v
::
proph_list_resolves
pvs
p
)
as
->
.
{
rewrite
(
Hres
p
vs
HR
)
.
simpl
.
by
rewrite
decide_True
.
}
{
rewrite
(
Hres
p
vs
HR
)
.
simpl
.
by
rewrite
decide_True
.
}
iMod
(
own_update_2
with
"H● Hp"
)
as
"[H● H◯]"
.
iMod
(
own_update_2
with
"H● Hp"
)
as
"[H● H◯]"
.
{
eapply
auth_update
.
apply
:
singleton_local_update
.
{
(* FIXME: FIXME(Coq #6294): needs new unification *)
eapply
auth_update
.
apply
:
singleton_local_update
.
-
by
rewrite
/
to_proph_map
lookup_fmap
HR
.
-
by
rewrite
/
to_proph_map
lookup_fmap
HR
.
-
by
apply
(
exclusive_local_update
_
(
Excl
(
proph_list_resolves
pvs
p
:
list
(
leibnizC
V
))))
.
}
-
by
apply
(
exclusive_local_update
_
(
Excl
(
proph_list_resolves
pvs
p
:
list
(
leibnizC
V
))))
.
}
rewrite
/
to_proph_map
-
fmap_insert
.
rewrite
/
to_proph_map
-
fmap_insert
.
...
...
This diff is collapsed.
Click to expand it.
theories/heap_lang/lib/counter.v
+
3
−
2
View file @
50b368c0
...
@@ -60,8 +60,9 @@ Section mono_proof.
...
@@ -60,8 +60,9 @@ Section mono_proof.
wp_cas_suc
.
iModIntro
.
iSplitL
"Hl Hγ"
.
wp_cas_suc
.
iModIntro
.
iSplitL
"Hl Hγ"
.
{
iNext
.
iExists
(
S
c
)
.
rewrite
Nat2Z
.
inj_succ
Z
.
add_1_l
.
by
iFrame
.
}
{
iNext
.
iExists
(
S
c
)
.
rewrite
Nat2Z
.
inj_succ
Z
.
add_1_l
.
by
iFrame
.
}
wp_if
.
iApply
"HΦ"
;
iExists
γ
;
repeat
iSplit
;
eauto
.
wp_if
.
iApply
"HΦ"
;
iExists
γ
;
repeat
iSplit
;
eauto
.
iApply
(
own_mono
with
"Hγf"
)
.
apply
:
auth_frag_mono
.
iApply
(
own_mono
with
"Hγf"
)
.
by
apply
mnat_included
,
le_n_S
.
(* FIXME: FIXME(Coq #6294): needs new unification *)
apply
:
auth_frag_mono
.
by
apply
mnat_included
,
le_n_S
.
-
wp_cas_fail
;
first
(
by
intros
[
=
?
%
Nat2Z
.
inj
])
.
iModIntro
.
-
wp_cas_fail
;
first
(
by
intros
[
=
?
%
Nat2Z
.
inj
])
.
iModIntro
.
iSplitL
"Hl Hγ"
;
[
iNext
;
iExists
c'
;
by
iFrame
|]
.
iSplitL
"Hl Hγ"
;
[
iNext
;
iExists
c'
;
by
iFrame
|]
.
wp_if
.
iApply
(
"IH"
with
"[Hγf] [HΦ]"
);
last
by
auto
.
wp_if
.
iApply
(
"IH"
with
"[Hγf] [HΦ]"
);
last
by
auto
.
...
...
This diff is collapsed.
Click to expand it.
theories/program_logic/ownp.v
+
2
−
2
View file @
50b368c0
...
@@ -118,8 +118,8 @@ Section lifting.
...
@@ -118,8 +118,8 @@ Section lifting.
iModIntro
;
iSplit
;
[
by
destruct
s
|];
iNext
;
iIntros
(
e2
σ2
efs
Hstep
)
.
iModIntro
;
iSplit
;
[
by
destruct
s
|];
iNext
;
iIntros
(
e2
σ2
efs
Hstep
)
.
iDestruct
"Hσκs"
as
"Hσ"
.
rewrite
/
ownP
.
iDestruct
"Hσκs"
as
"Hσ"
.
rewrite
/
ownP
.
iMod
(
own_update_2
with
"Hσ Hσf"
)
as
"[Hσ Hσf]"
.
iMod
(
own_update_2
with
"Hσ Hσf"
)
as
"[Hσ Hσf]"
.
{
apply
auth_update
.
apply
:
option_local_update
.
{
apply
auth_update
.
apply
option_local_update
.
by
apply
:
(
exclusive_local_update
_
(
Excl
σ2
))
.
}
by
apply
(
exclusive_local_update
_
(
Excl
σ2
))
.
}
iFrame
"Hσ"
.
iApply
(
"H"
with
"[]"
);
eauto
with
iFrame
.
iFrame
"Hσ"
.
iApply
(
"H"
with
"[]"
);
eauto
with
iFrame
.
Qed
.
Qed
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment