diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /backend/Constprop.v | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/Constprop.v')
| -rw-r--r-- | backend/Constprop.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Constprop.v b/backend/Constprop.v index 8f4cb76d..5ca69183 100644 --- a/backend/Constprop.v +++ b/backend/Constprop.v @@ -183,12 +183,12 @@ Definition transf_instr (f: function) (an: PMap.t VA.t) (rm: romem) Iop cop nil dst s | None => let (addr', args') := addr_strength_reduction addr args aargs in - Iload chunk addr' args' dst s + Iload chunk addr' args' dst s end | Istore chunk addr args src s => let aargs := aregs ae args in let (addr', args') := addr_strength_reduction addr args aargs in - Istore chunk addr' args' src s + Istore chunk addr' args' src s | Icall sig ros args res s => Icall sig (transf_ros ae ros) args res s | Itailcall sig ros args => |