diff options
author | 2016-01-13 12:09:39 +0000 | |
---|---|---|
committer | 2016-01-13 12:38:52 +0000 | |
commit | 1af564e2d3b560fb9a076eb35ea20471aed0dc92 (patch) | |
tree | 1a369a546a6319fd866c241d5c92f3a241d314af /compiler/optimizing/register_allocator.cc | |
parent | 922698ded1e80cad1ecce4c2172a88c76a216373 (diff) |
Set side effects to HNullCheck and HBoundsCheck.
Both can trigger GC, as they will call NullPointerException or
IndexOutOfBoundsException constructors.
bug:26532563
Change-Id: Id9e42f0450caaaf365630989e1b36e98add46c89
Diffstat (limited to 'compiler/optimizing/register_allocator.cc')
-rw-r--r-- | compiler/optimizing/register_allocator.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc index 9a06d9be41..eb0419b6e0 100644 --- a/compiler/optimizing/register_allocator.cc +++ b/compiler/optimizing/register_allocator.cc @@ -1677,7 +1677,9 @@ void RegisterAllocator::ConnectSiblings(LiveInterval* interval) { LocationSummary* locations = safepoint_position->GetLocations(); if ((current->GetType() == Primitive::kPrimNot) && current->GetParent()->HasSpillSlot()) { - DCHECK(interval->GetDefinedBy()->IsActualObject()) << interval->GetDefinedBy()->DebugName(); + DCHECK(interval->GetDefinedBy()->IsActualObject()) + << interval->GetDefinedBy()->DebugName() + << "@" << safepoint_position->GetInstruction()->DebugName(); locations->SetStackBit(current->GetParent()->GetSpillSlot() / kVRegSize); } @@ -1691,7 +1693,8 @@ void RegisterAllocator::ConnectSiblings(LiveInterval* interval) { } if (current->GetType() == Primitive::kPrimNot) { DCHECK(interval->GetDefinedBy()->IsActualObject()) - << interval->GetDefinedBy()->DebugName(); + << interval->GetDefinedBy()->DebugName() + << "@" << safepoint_position->GetInstruction()->DebugName(); locations->SetRegisterBit(source.reg()); } break; |