diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-18 10:50:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-18 10:50:06 -0700 |
| commit | b9070095218595a5d6a37ef874df2794c1761030 (patch) | |
| tree | cab984d0ac72b8df4915f75277cd7efe0e8c9a3e /runtime/stack.cc | |
| parent | 08524597899d0bb021c9165218deff51dc88da50 (diff) | |
| parent | df62950e7a32031b82360c407d46a37b94188fbb (diff) | |
| download | art-b9070095218595a5d6a37ef874df2794c1761030.zip art-b9070095218595a5d6a37ef874df2794c1761030.tar.gz art-b9070095218595a5d6a37ef874df2794c1761030.tar.bz2 | |
resolved conflicts for merge of df62950e to dalvik-dev
Change-Id: I78fbcfc7a2dcbeccb7557ca27302928d7d00debd
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index f4ae81d..35cd895 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -185,12 +185,12 @@ void StackVisitor::SetVReg(mirror::AbstractMethod* m, uint16_t vreg, uint32_t ne } uintptr_t StackVisitor::GetGPR(uint32_t reg) const { - DCHECK (cur_quick_frame_ != NULL) << "This is a quick frame routine"; + DCHECK(cur_quick_frame_ != NULL) << "This is a quick frame routine"; return context_->GetGPR(reg); } void StackVisitor::SetGPR(uint32_t reg, uintptr_t value) { - DCHECK (cur_quick_frame_ != NULL) << "This is a quick frame routine"; + DCHECK(cur_quick_frame_ != NULL) << "This is a quick frame routine"; context_->SetGPR(reg, value); } @@ -341,7 +341,7 @@ void StackVisitor::WalkStack(bool include_transitions) { } cur_depth_++; cur_shadow_frame_ = cur_shadow_frame_->GetLink(); - } while(cur_shadow_frame_ != NULL); + } while (cur_shadow_frame_ != NULL); } if (include_transitions) { bool should_continue = VisitFrame(); |