diff options
author | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 13:56:20 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-02 09:21:27 -0700 |
commit | 3d21bdf8894e780d349c481e5c9e29fe1556051c (patch) | |
tree | 61a5231f36c0dabd73457fec81df103462a05aff /test | |
parent | 71f0a8a123fa27bdc857a98afebbaf0ed09dac15 (diff) | |
download | art-3d21bdf8894e780d349c481e5c9e29fe1556051c.zip art-3d21bdf8894e780d349c481e5c9e29fe1556051c.tar.gz art-3d21bdf8894e780d349c481e5c9e29fe1556051c.tar.bz2 |
Move mirror::ArtMethod to native
Optimizing + quick tests are passing, devices boot.
TODO: Test and fix bugs in mips64.
Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS.
Some of the savings are from removal of virtual methods and direct
methods object arrays.
Bug: 19264997
(cherry picked from commit e401d146407d61eeb99f8d6176b2ac13c4df1e33)
Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d
Fix some ArtMethod related bugs
Added root visiting for runtime methods, not currently required
since the GcRoots in these methods are null.
Added missing GetInterfaceMethodIfProxy in GetMethodLine, fixes
--trace run-tests 005, 044.
Fixed optimizing compiler bug where we used a normal stack location
instead of double on ARM64, this fixes the debuggable tests.
TODO: Fix JDWP tests.
Bug: 19264997
Change-Id: I7c55f69c61d1b45351fd0dc7185ffe5efad82bd3
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Bug: 19264997
Change-Id: Ief45cdd4bae5a43fc8bfdfa7cf744e2c57529457
Fix JDWP tests after ArtMethod change
Fixes Throwable::GetStackDepth for exception event detection after
internal stack trace representation change.
Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of
proxy method.
Bug: 19264997
Change-Id: I363e293796848c3ec491c963813f62d868da44d2
Fix accidental IMT and root marking regression
Was always using the conflict trampoline. Also included fix for
regression in GC time caused by extra roots. Most of the regression
was IMT.
Fixed bug in DumpGcPerformanceInfo where we would get SIGABRT due to
detached thread.
EvaluateAndApplyChanges:
From ~2500 -> ~1980
GC time: 8.2s -> 7.2s due to 1s less of MarkConcurrentRoots
Bug: 19264997
Change-Id: I4333e80a8268c2ed1284f87f25b9f113d4f2c7e0
Fix bogus image test assert
Previously we were comparing the size of the non moving space to
size of the image file.
Now we properly compare the size of the image space against the size
of the image file.
Bug: 19264997
Change-Id: I7359f1f73ae3df60c5147245935a24431c04808a
[MIPS64] Fix art_quick_invoke_stub argument offsets.
ArtMethod reference's size got bigger, so we need to move other args
and leave enough space for ArtMethod* and 'this' pointer.
This fixes mips64 boot.
Bug: 19264997
Change-Id: I47198d5f39a4caab30b3b77479d5eedaad5006ab
Diffstat (limited to 'test')
-rw-r--r-- | test/004-ReferenceMap/stack_walk_refmap_jni.cc | 2 | ||||
-rw-r--r-- | test/004-StackWalk/stack_walk_jni.cc | 2 | ||||
-rw-r--r-- | test/004-UnsafeTest/unsafe_test.cc | 2 | ||||
-rw-r--r-- | test/454-get-vreg/get_vreg_jni.cc | 4 | ||||
-rw-r--r-- | test/455-set-vreg/set_vreg_jni.cc | 4 | ||||
-rw-r--r-- | test/457-regs/regs_jni.cc | 4 | ||||
-rw-r--r-- | test/461-get-reference-vreg/get_reference_vreg_jni.cc | 4 | ||||
-rw-r--r-- | test/466-get-live-vreg/get_live_vreg_jni.cc | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/test/004-ReferenceMap/stack_walk_refmap_jni.cc b/test/004-ReferenceMap/stack_walk_refmap_jni.cc index 76ef4a9..e626e48 100644 --- a/test/004-ReferenceMap/stack_walk_refmap_jni.cc +++ b/test/004-ReferenceMap/stack_walk_refmap_jni.cc @@ -36,7 +36,7 @@ struct ReferenceMap2Visitor : public CheckReferenceMapVisitor { if (CheckReferenceMapVisitor::VisitFrame()) { return true; } - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); // Given the method name and the number of times the method has been called, diff --git a/test/004-StackWalk/stack_walk_jni.cc b/test/004-StackWalk/stack_walk_jni.cc index c40de7e..f66b715 100644 --- a/test/004-StackWalk/stack_walk_jni.cc +++ b/test/004-StackWalk/stack_walk_jni.cc @@ -36,7 +36,7 @@ class TestReferenceMapVisitor : public CheckReferenceMapVisitor { if (CheckReferenceMapVisitor::VisitFrame()) { return true; } - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); StringPiece m_name(m->GetName()); // Given the method name and the number of times the method has been called, diff --git a/test/004-UnsafeTest/unsafe_test.cc b/test/004-UnsafeTest/unsafe_test.cc index ca0e39e..3b0cf23 100644 --- a/test/004-UnsafeTest/unsafe_test.cc +++ b/test/004-UnsafeTest/unsafe_test.cc @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "art_method-inl.h" #include "jni.h" #include "mirror/array.h" -#include "mirror/art_method-inl.h" #include "mirror/class.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" diff --git a/test/454-get-vreg/get_vreg_jni.cc b/test/454-get-vreg/get_vreg_jni.cc index 0ef2964..33bdc20 100644 --- a/test/454-get-vreg/get_vreg_jni.cc +++ b/test/454-get-vreg/get_vreg_jni.cc @@ -15,8 +15,8 @@ */ #include "arch/context.h" +#include "art_method-inl.h" #include "jni.h" -#include "mirror/art_method-inl.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread.h" @@ -34,7 +34,7 @@ class TestVisitor : public StackVisitor { found_method_index_(0) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); if (m_name.compare("testSimpleVReg") == 0) { diff --git a/test/455-set-vreg/set_vreg_jni.cc b/test/455-set-vreg/set_vreg_jni.cc index dffbfa4..7541189 100644 --- a/test/455-set-vreg/set_vreg_jni.cc +++ b/test/455-set-vreg/set_vreg_jni.cc @@ -15,8 +15,8 @@ */ #include "arch/context.h" +#include "art_method-inl.h" #include "jni.h" -#include "mirror/art_method-inl.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread.h" @@ -33,7 +33,7 @@ class TestVisitor : public StackVisitor { this_value_(this_value) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); if (m_name.compare("testIntVReg") == 0) { diff --git a/test/457-regs/regs_jni.cc b/test/457-regs/regs_jni.cc index 193ab9d..96f0e52 100644 --- a/test/457-regs/regs_jni.cc +++ b/test/457-regs/regs_jni.cc @@ -15,8 +15,8 @@ */ #include "arch/context.h" +#include "art_method-inl.h" #include "jni.h" -#include "mirror/art_method-inl.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread.h" @@ -32,7 +32,7 @@ class TestVisitor : public StackVisitor { : StackVisitor(thread, context, StackVisitor::StackWalkKind::kIncludeInlinedFrames) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); if (m_name.compare("mergeOk") == 0) { diff --git a/test/461-get-reference-vreg/get_reference_vreg_jni.cc b/test/461-get-reference-vreg/get_reference_vreg_jni.cc index a8ef684..23fe43d 100644 --- a/test/461-get-reference-vreg/get_reference_vreg_jni.cc +++ b/test/461-get-reference-vreg/get_reference_vreg_jni.cc @@ -15,8 +15,8 @@ */ #include "arch/context.h" +#include "art_method-inl.h" #include "jni.h" -#include "mirror/art_method-inl.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread.h" @@ -34,7 +34,7 @@ class TestVisitor : public StackVisitor { found_method_index_(0) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); if (m_name.compare("testThisWithInstanceCall") == 0) { diff --git a/test/466-get-live-vreg/get_live_vreg_jni.cc b/test/466-get-live-vreg/get_live_vreg_jni.cc index 4724e8e..c4f415b 100644 --- a/test/466-get-live-vreg/get_live_vreg_jni.cc +++ b/test/466-get-live-vreg/get_live_vreg_jni.cc @@ -15,8 +15,8 @@ */ #include "arch/context.h" +#include "art_method-inl.h" #include "jni.h" -#include "mirror/art_method-inl.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread.h" @@ -31,7 +31,7 @@ class TestVisitor : public StackVisitor { : StackVisitor(thread, context, StackVisitor::StackWalkKind::kIncludeInlinedFrames) {} bool VisitFrame() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - mirror::ArtMethod* m = GetMethod(); + ArtMethod* m = GetMethod(); std::string m_name(m->GetName()); if (m_name.compare("testLiveArgument") == 0) { |