diff options
| author | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-05-28 12:38:05 +0200 |
|---|---|---|
| committer | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-05-28 12:38:05 +0200 |
| commit | 8752cea89f862d92d49183fe10d1918588143ab1 (patch) | |
| tree | 2e947a22395702b741c8fac14c7d89ac419c4b5b /scheduling/BTL_SEtheory.v | |
| parent | ef5775ea869701eb04c873174c362b314166bf06 (diff) | |
| download | compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.tar.gz compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.zip | |
fix some merge errors
Diffstat (limited to 'scheduling/BTL_SEtheory.v')
| -rw-r--r-- | scheduling/BTL_SEtheory.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scheduling/BTL_SEtheory.v b/scheduling/BTL_SEtheory.v index cea69f55..5b15fe9b 100644 --- a/scheduling/BTL_SEtheory.v +++ b/scheduling/BTL_SEtheory.v @@ -731,7 +731,7 @@ pour représenter l'ensemble des chemins. Fixpoint sexec_rec f ib sis (k: sistate -> sstate): sstate := match ib with - | BF fin => Sfinal (tr_sis f fin sis) (sexec_final_sfv fin sis) + | BF fin _ => Sfinal (tr_sis f fin sis) (sexec_final_sfv fin sis) (* basic instructions *) | Bnop _ => k sis | Bop op args res _ => k (sexec_op op args res sis) |