diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-05 08:11:34 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-10-05 08:11:34 +0000 |
| commit | a6c369cbd63996c1571ae601b7d92070f024b22c (patch) | |
| tree | dc4f3f5a52ae4ea230f307ce5f442137f014b79b /cfrontend/Clight.v | |
| parent | b55147379939553eccd4289fd18e7f161619be4d (diff) | |
Merge of the "alignas" branch.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2342 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'cfrontend/Clight.v')
| -rw-r--r-- | cfrontend/Clight.v | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cfrontend/Clight.v b/cfrontend/Clight.v index 3bd06df..6a57999 100644 --- a/cfrontend/Clight.v +++ b/cfrontend/Clight.v @@ -218,7 +218,8 @@ Inductive assign_loc (ty: type) (m: mem) (b: block) (ofs: int): assign_loc ty m b ofs v m' | assign_loc_copy: forall b' ofs' bytes m', access_mode ty = By_copy -> - (alignof ty | Int.unsigned ofs') -> (alignof ty | Int.unsigned ofs) -> + (alignof_blockcopy ty | Int.unsigned ofs') -> + (alignof_blockcopy ty | Int.unsigned ofs) -> b' <> b \/ Int.unsigned ofs' = Int.unsigned ofs \/ Int.unsigned ofs' + sizeof ty <= Int.unsigned ofs \/ Int.unsigned ofs + sizeof ty <= Int.unsigned ofs' -> |