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
Pierre Roux
Iris
Commits
353f1c11
Commit
353f1c11
authored
5 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
fix merge fallout
parent
ebf63295
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
theories/heap_lang/lifting.v
+13
-11
13 additions, 11 deletions
theories/heap_lang/lifting.v
with
13 additions
and
11 deletions
theories/heap_lang/lifting.v
+
13
−
11
View file @
353f1c11
...
@@ -572,33 +572,35 @@ Proof.
...
@@ -572,33 +572,35 @@ Proof.
eexists
.
by
apply
vlookup_lookup
.
eexists
.
by
apply
vlookup_lookup
.
Qed
.
Qed
.
Lemma
wp_cas_suc_offset
s
E
l
off
vs
v1
v2
:
Lemma
wp_cas_suc_offset
s
E
l
off
vs
v'
v1
v2
:
vs
!!
off
=
Some
v1
→
vs
!!
off
=
Some
v'
→
vals_cas_compare_safe
v1
v1
→
val_for_compare
v'
=
val_for_compare
v1
→
vals_cas_compare_safe
v'
v1
→
{{{
▷
l
↦∗
vs
}}}
{{{
▷
l
↦∗
vs
}}}
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
{{{
RET
#
true
;
l
↦∗
<
[
off
:=
v2
]
>
vs
}}}
.
{{{
RET
#
true
;
l
↦∗
<
[
off
:=
v2
]
>
vs
}}}
.
Proof
.
Proof
.
iIntros
(
Hlookup
Hcmp
Φ
)
"Hl HΦ"
.
iIntros
(
Hlookup
??
Φ
)
"Hl HΦ"
.
iDestruct
(
update_array
l
_
_
_
Hlookup
with
"Hl"
)
as
"[Hl1 Hl2]"
.
iDestruct
(
update_array
l
_
_
_
Hlookup
with
"Hl"
)
as
"[Hl1 Hl2]"
.
iApply
(
wp_cas_suc
with
"Hl1"
)
.
{
left
.
by
destruct
Hcmp
.
}
iApply
(
wp_cas_suc
with
"Hl1"
)
;
[
done
..|]
.
iNext
.
iIntros
"Hl1"
.
iApply
"HΦ"
.
iApply
"Hl2"
.
iApply
"Hl1"
.
iNext
.
iIntros
"Hl1"
.
iApply
"HΦ"
.
iApply
"Hl2"
.
iApply
"Hl1"
.
Qed
.
Qed
.
Lemma
wp_cas_suc_offset_vec
s
E
l
sz
(
off
:
fin
sz
)
(
vs
:
vec
val
sz
)
v1
v2
:
Lemma
wp_cas_suc_offset_vec
s
E
l
sz
(
off
:
fin
sz
)
(
vs
:
vec
val
sz
)
v'
v1
v2
:
vs
!!!
off
=
v1
→
vs
!!!
off
=
v'
→
vals_cas_compare_safe
v1
v1
→
val_for_compare
v'
=
val_for_compare
v1
→
vals_cas_compare_safe
v'
v1
→
{{{
▷
l
↦∗
vs
}}}
{{{
▷
l
↦∗
vs
}}}
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
{{{
RET
#
true
;
l
↦∗
vinsert
off
v2
vs
}}}
.
{{{
RET
#
true
;
l
↦∗
vinsert
off
v2
vs
}}}
.
Proof
.
Proof
.
intros
.
setoid_rewrite
vec_to_list_insert
.
apply
wp_cas_suc_offset
=>
//.
intros
.
setoid_rewrite
vec_to_list_insert
.
e
apply
wp_cas_suc_offset
=>
//.
by
apply
vlookup_lookup
.
by
apply
vlookup_lookup
.
Qed
.
Qed
.
Lemma
wp_cas_fail_offset
s
E
l
off
vs
v0
v1
v2
:
Lemma
wp_cas_fail_offset
s
E
l
off
vs
v0
v1
v2
:
vs
!!
off
=
Some
v0
→
vs
!!
off
=
Some
v0
→
v
0
≠
v1
→
v
al_for_compare
v0
≠
val_for_compare
v1
→
vals_cas_compare_safe
v0
v1
→
vals_cas_compare_safe
v0
v1
→
{{{
▷
l
↦∗
vs
}}}
{{{
▷
l
↦∗
vs
}}}
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
...
@@ -613,7 +615,7 @@ Proof.
...
@@ -613,7 +615,7 @@ Proof.
Qed
.
Qed
.
Lemma
wp_cas_fail_offset_vec
s
E
l
sz
(
off
:
fin
sz
)
(
vs
:
vec
val
sz
)
v1
v2
:
Lemma
wp_cas_fail_offset_vec
s
E
l
sz
(
off
:
fin
sz
)
(
vs
:
vec
val
sz
)
v1
v2
:
vs
!!!
off
≠
v1
→
val_for_compare
(
vs
!!!
off
)
≠
val_for_compare
v1
→
vals_cas_compare_safe
(
vs
!!!
off
)
v1
→
vals_cas_compare_safe
(
vs
!!!
off
)
v1
→
{{{
▷
l
↦∗
vs
}}}
{{{
▷
l
↦∗
vs
}}}
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
CAS
#
(
l
+
ₗ
off
)
v1
v2
@
s
;
E
...
...
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