Skip to content

Adapt to https://github.com/rocq-prover/rocq/pull/21478 #570

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

Merged
xavierleroy merged 2 commits into from
Jan 27, 2026
Merged

Adapt to https://github.com/rocq-prover/rocq/pull/21478 #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8a8a7
Adapt to https://github.com/rocq-prover/rocq/pull/21478
proux01 Jan 8, 2026
ed6ce4b
Use different, more consistent variable names
xavierleroy Jan 27, 2026
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
6 changes: 3 additions & 3 deletions backend/Cminor.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ Definition env := PTree.t val.

Fixpoint set_params (vl: list val) (il: list ident) {struct il} : env :=
match il, vl with
| i1 :: is, v1 :: vs => PTree.set i1 v1 (set_params vs is)
| i1 :: is, nil => PTree.set i1 Vundef (set_params nil is)
| i1 :: il, v1 :: vl => PTree.set i1 v1 (set_params vl il)
| i1 :: il, nil => PTree.set i1 Vundef (set_params nil il)
| _, _ => PTree.empty val
end.

Fixpoint set_locals (il: list ident) (e: env) {struct il} : env :=
match il with
| nil => e
| i1 :: is => PTree.set i1 Vundef (set_locals is e)
| i1 :: il => PTree.set i1 Vundef (set_locals il e)
end.

Definition set_optvar (optid: option ident) (v: val) (e: env) : env :=
Expand Down
4 changes: 2 additions & 2 deletions cfrontend/Cminorgenproof.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,8 +1103,8 @@ Qed.

Fixpoint set_params' (vl: list val) (il: list ident) (te: Cminor.env) : Cminor.env :=
match il, vl with
| i1 :: is, v1 :: vs => set_params' vs is (PTree.set i1 v1 te)
| i1 :: is, nil => set_params' nil is (PTree.set i1 Vundef te)
| i1 :: il, v1 :: vl => set_params' vl il (PTree.set i1 v1 te)
| i1 :: il, nil => set_params' nil il (PTree.set i1 Vundef te)
| _, _ => te
end.

Expand Down
Loading