diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-09-20 18:55:20 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-09-20 18:55:20 +0200 |
| commit | aa5b5a4e618b6a0aecc227021080aa4b901d806f (patch) | |
| tree | 0cf0c0bd42a05b49951d896cf2b5270aabdb9316 /backend/Lineartyping.v | |
| parent | a363d6b93df8fbde24c945551cfea5d845b57fc4 (diff) | |
| parent | 24406a351e9d64c2953b0b9fc7ef0b3d79db9b85 (diff) | |
| download | compcert-kvx-aa5b5a4e618b6a0aecc227021080aa4b901d806f.tar.gz compcert-kvx-aa5b5a4e618b6a0aecc227021080aa4b901d806f.zip | |
Merge remote-tracking branch 'origin/mppa-work-upstream-merge' into mppa-workv3.6_mppa_2019-09-20
merge with v3.6
Diffstat (limited to 'backend/Lineartyping.v')
| -rw-r--r-- | backend/Lineartyping.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/Lineartyping.v b/backend/Lineartyping.v index 1fe23a9d..0e3b7c8e 100644 --- a/backend/Lineartyping.v +++ b/backend/Lineartyping.v @@ -321,11 +321,11 @@ Local Opaque mreg_type. + (* other ops *) destruct (type_of_operation op) as [ty_args ty_res] eqn:TYOP. InvBooleans. econstructor; eauto. - apply wt_setreg; auto; try (apply wt_undef_regs; auto). - eapply Val.has_subtype; eauto. + apply wt_setreg. eapply Val.has_subtype; eauto. change ty_res with (snd (ty_args, ty_res)). rewrite <- TYOP. eapply type_of_operation_sound; eauto. red; intros; subst op. simpl in ISMOVE. - destruct args; try discriminate. destruct args; discriminate. + destruct args; try discriminate. destruct args; discriminate. + apply wt_undef_regs; auto. - (* load *) simpl in *; InvBooleans. econstructor; eauto. |