OSDN Git Service

Revert "Revert "Make class redefinition work with native methods on stack.""
authorAlex Light <allight@google.com>
Fri, 10 Feb 2017 16:33:26 +0000 (16:33 +0000)
committerAlex Light <allight@google.com>
Fri, 10 Feb 2017 19:46:56 +0000 (11:46 -0800)
commit4493f92dfc70e01d95ad57bc4c0c38f59a616f70
tree8762ba0636b735e43cdd714755cd622ef718580b
parent806ac631e53f12061cb0ae7640aa9cd0dd79243d
Revert "Revert "Make class redefinition work with native methods on stack.""

When we were scanning the stack for tracing we were getting the wrong
stack-frame size for obsolete native methods. This fixes it by
creating real obsolete native methods so we can recognize them and
then doing the (rather long) calculation to find their real
stack-frame size.

This reverts commit 7558d27ccd0837fef7c4bfbff7fc82f07a787316.

Reason for revert: Fixed tracing failures.

Test: mma -j40 test-art-host
Test: ART_TEST_TRACE=true ART_TEST_INTERPRETER=true mma -j40 test-art-host

Change-Id: Ic65da1b51a43733ff60131832753afa0c4ce66b1
12 files changed:
runtime/art_method.cc
runtime/openjdkjvmti/ti_redefine.cc
runtime/stack.cc
test/945-obsolete-native/build [new file with mode: 0755]
test/945-obsolete-native/expected.txt [new file with mode: 0644]
test/945-obsolete-native/info.txt [new file with mode: 0644]
test/945-obsolete-native/obsolete_native.cc [new file with mode: 0644]
test/945-obsolete-native/run [new file with mode: 0755]
test/945-obsolete-native/src/Main.java [new file with mode: 0644]
test/945-obsolete-native/src/Transform.java [new file with mode: 0644]
test/Android.bp
test/ti-agent/common_load.cc