diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-02 16:25:25 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-02 16:25:25 +0200 |
commit | 170284b51766112e29d6bbfe519bad9f6da95269 (patch) | |
tree | 13a163ccee48cee0512a8af484b394623cdce030 /backend/Bounds.v | |
parent | 2e30ad9698a6f24a8a746f68b30c235913006392 (diff) | |
parent | 959432fa13a899290db5236f93575a8bfdc13bb5 (diff) | |
download | compcert-170284b51766112e29d6bbfe519bad9f6da95269.tar.gz compcert-170284b51766112e29d6bbfe519bad9f6da95269.zip |
Merge branch 'master' into dwarf
Diffstat (limited to 'backend/Bounds.v')
-rw-r--r-- | backend/Bounds.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Bounds.v b/backend/Bounds.v index bcd28487..249ff796 100644 --- a/backend/Bounds.v +++ b/backend/Bounds.v @@ -69,7 +69,7 @@ Definition instr_within_bounds (i: instruction) := | Lbuiltin ef args res => forall r, In r res \/ In r (destroyed_by_builtin ef) -> mreg_within_bounds r | Lannot ef args => - forall sl ofs ty, In (S sl ofs ty) args -> slot_within_bounds sl ofs ty + forall sl ofs ty, In (S sl ofs ty) (params_of_annot_args args) -> slot_within_bounds sl ofs ty | _ => True end. @@ -121,7 +121,7 @@ Definition slots_of_instr (i: instruction) : list (slot * Z * typ) := match i with | Lgetstack sl ofs ty r => (sl, ofs, ty) :: nil | Lsetstack r sl ofs ty => (sl, ofs, ty) :: nil - | Lannot ef args => slots_of_locs args + | Lannot ef args => slots_of_locs (params_of_annot_args args) | _ => nil end. |