diff options
| author | Alex Light <allight@google.com> | 2017-02-11 00:38:35 +0000 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2017-02-11 00:38:35 +0000 |
| commit | 38c20d4a694eea44a1bd3af32a6a99512c139358 (patch) | |
| tree | f5981b3ef21e41a4df6edc203615f15f23e93ad5 /runtime/stack.cc | |
| parent | 4493f92dfc70e01d95ad57bc4c0c38f59a616f70 (diff) | |
| download | art-38c20d4a694eea44a1bd3af32a6a99512c139358.tar.gz art-38c20d4a694eea44a1bd3af32a6a99512c139358.tar.bz2 art-38c20d4a694eea44a1bd3af32a6a99512c139358.zip | |
Revert "Revert "Revert "Make class redefinition work with native methods on stack."""
This reverts commit 4493f92dfc70e01d95ad57bc4c0c38f59a616f70.
Reason for revert: Fails interpreter-ac and relocate-npatchoat
Change-Id: I15eb4964c9101fa04e34b52acf9ffe25e6d4e60d
Test: revert
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 96fc664584..d7ba1d75d8 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -874,11 +874,9 @@ void StackVisitor::WalkStack(bool include_transitions) { CHECK_EQ(GetMethod(), callee) << "Expected: " << ArtMethod::PrettyMethod(callee) << " Found: " << ArtMethod::PrettyMethod(GetMethod()); } else { - // Instrumentation generally doesn't distinguish between a method's obsolete and - // non-obsolete version. - CHECK_EQ(instrumentation_frame.method_, GetMethod()->GetNonObsoleteMethod()) + CHECK_EQ(instrumentation_frame.method_, GetMethod()) << "Expected: " << ArtMethod::PrettyMethod(instrumentation_frame.method_) - << " Found: " << ArtMethod::PrettyMethod(GetMethod()->GetNonObsoleteMethod()); + << " Found: " << ArtMethod::PrettyMethod(GetMethod()); } if (num_frames_ != 0) { // Check agreement of frame Ids only if num_frames_ is computed to avoid infinite @@ -905,7 +903,7 @@ void StackVisitor::WalkStack(bool include_transitions) { << " native=" << method->IsNative() << std::noboolalpha << " entrypoints=" << method->GetEntryPointFromQuickCompiledCode() - << "," << (method->IsNative() ? method->GetEntryPointFromJni() : nullptr) + << "," << method->GetEntryPointFromJni() << " next=" << *cur_quick_frame_; } |