refs/heads/oreo-dev - platform/art

commit: 565cd4e9861d44c1b24b4b2054446edf3118cbba
[log]
author: Nicolas Geoffray <ngeoffray@google.com>
Thu Jun 22 11:56:01 2017 +0100
committer: Narayan Kamath <narayan@google.com>
Thu Jun 22 17:51:38 2017 +0000
tree: 99e6abb0184683a01b76b2aa366ab5def16159d1
parent: cd3d23c17b00ddc9768b3c60886d92a93f2d331a [diff]

Fix loop optimization in the presence of environment uses.

We should not remove instructions that have deoptimize as
users, or that have environment uses in a debuggable setup.

bug: 62536525
bug: 33775412
Test: 656-loop-deopt

(cherry picked from commit 1a0a519c82044ec3e6d3910ff0602b11292de47a)

Change-Id: I213dc85ac644619b041f0fa408e112352efcef2d

compiler/optimizing/loop_optimization.cc[diff]
compiler/optimizing/loop_optimization.h[diff]
test/656-loop-deopt/expected.txt[Added - diff]
test/656-loop-deopt/info.txt[Added - diff]
test/656-loop-deopt/src/Main.java[Added - diff]

5 files changed

tree: 99e6abb0184683a01b76b2aa366ab5def16159d1