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/Deadcode.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/Deadcode.v')
| -rw-r--r-- | backend/Deadcode.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Deadcode.v b/backend/Deadcode.v index 9bf17d1d..fa99915d 100644 --- a/backend/Deadcode.v +++ b/backend/Deadcode.v @@ -168,7 +168,7 @@ Definition analyze (approx: PMap.t VA.t) (f: function): option (PMap.t NA.t) := (** * Part 2: the code transformation *) -Definition transf_instr (approx: PMap.t VA.t) (an: PMap.t NA.t) +Definition transf_instr (approx: PMap.t VA.t) (an: PMap.t NA.t) (pc: node) (instr: instruction) := match instr with | Iop op args res s => @@ -177,7 +177,7 @@ Definition transf_instr (approx: PMap.t VA.t) (an: PMap.t NA.t) Inop s else if is_int_zero nres then Iop (Ointconst Int.zero) nil res s - else if operation_is_redundant op nres then + else if operation_is_redundant op nres then match args with | arg :: _ => Iop Omove (arg :: nil) res s | nil => instr |