diff options
| author | 2017-11-30 09:12:13 +0000 | |
|---|---|---|
| committer | 2017-11-30 09:12:13 +0000 | |
| commit | 056d7756152bb3ced81dd57781be5028428ce2bd (patch) | |
| tree | 154ae8968a450a2e02d88207fa09e380fd380553 /runtime/managed_stack-inl.h | |
| parent | e7441631a11e2e07ce863255a59ee4de29c6a56f (diff) | |
Revert "Revert "Revert "JIT JNI stubs."""
Still seeing occasional failures on 667-jit-jni-stub
Bug: 65574695
Bug: 69843562
This reverts commit e7441631a11e2e07ce863255a59ee4de29c6a56f.
Change-Id: I3db751679ef7bdf31c933208aaffe4fac749a14b
Diffstat (limited to 'runtime/managed_stack-inl.h')
| -rw-r--r-- | runtime/managed_stack-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/managed_stack-inl.h b/runtime/managed_stack-inl.h index 678be8e098..689dd8009a 100644 --- a/runtime/managed_stack-inl.h +++ b/runtime/managed_stack-inl.h @@ -24,7 +24,7 @@ namespace art { inline ShadowFrame* ManagedStack::PushShadowFrame(ShadowFrame* new_top_frame) { - DCHECK(!HasTopQuickFrame()); + DCHECK(top_quick_frame_ == nullptr); ShadowFrame* old_frame = top_shadow_frame_; top_shadow_frame_ = new_top_frame; new_top_frame->SetLink(old_frame); @@ -32,7 +32,7 @@ inline ShadowFrame* ManagedStack::PushShadowFrame(ShadowFrame* new_top_frame) { } inline ShadowFrame* ManagedStack::PopShadowFrame() { - DCHECK(!HasTopQuickFrame()); + DCHECK(top_quick_frame_ == nullptr); CHECK(top_shadow_frame_ != nullptr); ShadowFrame* frame = top_shadow_frame_; top_shadow_frame_ = frame->GetLink(); |