diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-05-07 11:57:35 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-05-11 14:17:22 +0100 |
| commit | 0a23d74dc2751440822960eab218be4cb8843647 (patch) | |
| tree | 39d69de5d812826c4065d0acd38a58cd983f21f0 /compiler/optimizing/register_allocator.cc | |
| parent | cdeb0b5fede4c06488f43a212591e661d946bc78 (diff) | |
| download | art-0a23d74dc2751440822960eab218be4cb8843647.tar.gz art-0a23d74dc2751440822960eab218be4cb8843647.tar.bz2 art-0a23d74dc2751440822960eab218be4cb8843647.zip | |
Add a parent environment to HEnvironment.
This code has no functionality change. It adds a placeholder
for chaining inlined frames.
Change-Id: I5ec57335af76ee406052345b947aad98a6a4423a
Diffstat (limited to 'compiler/optimizing/register_allocator.cc')
| -rw-r--r-- | compiler/optimizing/register_allocator.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc index 2375595978..f53f846326 100644 --- a/compiler/optimizing/register_allocator.cc +++ b/compiler/optimizing/register_allocator.cc @@ -1534,9 +1534,10 @@ void RegisterAllocator::ConnectSiblings(LiveInterval* interval) { } while (env_use != nullptr && env_use->GetPosition() <= range->GetEnd()) { - DCHECK(current->CoversSlow(env_use->GetPosition()) || (env_use->GetPosition() == range->GetEnd())); - LocationSummary* locations = env_use->GetUser()->GetLocations(); - locations->SetEnvironmentAt(env_use->GetInputIndex(), source); + DCHECK(current->CoversSlow(env_use->GetPosition()) + || (env_use->GetPosition() == range->GetEnd())); + HEnvironment* environment = env_use->GetUser()->GetEnvironment(); + environment->SetLocationAt(env_use->GetInputIndex(), source); env_use = env_use->GetNext(); } |