diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-09 14:11:47 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-09 14:20:54 -0700 |
| commit | 119c6bd97f7ac24b64eaf4e9333abb44acbf780f (patch) | |
| tree | d22dfb17249fa0dc5f1e506ca9eb88d9b9b6fa9f /runtime/stack.cc | |
| parent | b60508391b7f7343d39e39f98e7f254917cab91c (diff) | |
| download | art-119c6bd97f7ac24b64eaf4e9333abb44acbf780f.zip art-119c6bd97f7ac24b64eaf4e9333abb44acbf780f.tar.gz art-119c6bd97f7ac24b64eaf4e9333abb44acbf780f.tar.bz2 | |
Fix stub_test to pass with SS collector.
Changed the test to access the allocation entrypoints from the thread.
Change the order roots are visited to prevent a rare error where the
java lang reflect art method would move before it was checked in
SanityCheckFrame.
Change-Id: Ifb96220f3fbb74ea5d720777f130450f04c0e044
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 5e64e59..6667419 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -270,7 +270,7 @@ instrumentation::InstrumentationStackFrame& StackVisitor::GetInstrumentationStac void StackVisitor::SanityCheckFrame() const { if (kIsDebugBuild) { mirror::ArtMethod* method = GetMethod(); - CHECK(method->GetClass() == mirror::ArtMethod::GetJavaLangReflectArtMethod()); + CHECK_EQ(method->GetClass(), mirror::ArtMethod::GetJavaLangReflectArtMethod()); if (cur_quick_frame_ != nullptr) { method->AssertPcIsWithinQuickCode(cur_quick_frame_pc_); // Frame sanity. |