diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-11-26 12:00:11 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-12-10 16:00:58 -0800 |
| commit | c528dba35b5faece51ca658fc008b688f8b690ad (patch) | |
| tree | d95c113a639d07f7e3b88e8a6caa9b5f6e044801 /runtime/interpreter/interpreter.cc | |
| parent | 76f552307ee980221626d1dff0ada56c989d24ca (diff) | |
| download | art-c528dba35b5faece51ca658fc008b688f8b690ad.zip art-c528dba35b5faece51ca658fc008b688f8b690ad.tar.gz art-c528dba35b5faece51ca658fc008b688f8b690ad.tar.bz2 | |
Enable moving classes.
Slight reduction in Zygote size, memory savings are in the noise.
Before: Zygote size: 8739224
After: Zygote size: 8733568
Fixed a bug where we didn't set the concurrent start bytes after
switching the allocator from bump pointer to ROSAlloc in the
zygote. This caused excessive memory usage.
Added the method verifiers as roots to fix an issue caused by
RegTypes holding a Class*.
Added logic to clear card table in the SemiSpace collector, this
reduces DalvikOther from ~2400k -> ~1760k when using the SemiSpace
collector.
Added a missing lock to the timing loggers which caused a rare
one time crash in std::set.
Bug: 11771255
Bug: 8499494
Bug: 10802951
Change-Id: I99d2b528cd51c1c5ed7012e3220b3aefded680ae
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 9938478..02c9012 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -343,12 +343,13 @@ void EnterInterpreterFromInvoke(Thread* self, ArtMethod* method, Object* receive ++cur_reg; } else if (UNLIKELY(!method->GetDeclaringClass()->IsInitializing())) { ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); - if (UNLIKELY(!class_linker->EnsureInitialized(method->GetDeclaringClass(), true, true))) { + SirtRef<mirror::Class> sirt_c(self, method->GetDeclaringClass()); + if (UNLIKELY(!class_linker->EnsureInitialized(sirt_c, true, true))) { CHECK(self->IsExceptionPending()); self->PopShadowFrame(); return; } - CHECK(method->GetDeclaringClass()->IsInitializing()); + CHECK(sirt_c->IsInitializing()); } const char* shorty = mh.GetShorty(); for (size_t shorty_pos = 0, arg_pos = 0; cur_reg < num_regs; ++shorty_pos, ++arg_pos, cur_reg++) { @@ -428,7 +429,7 @@ extern "C" void artInterpreterToInterpreterBridge(Thread* self, MethodHelper& mh ArtMethod* method = shadow_frame->GetMethod(); // Ensure static methods are initialized. if (method->IsStatic()) { - Class* declaringClass = method->GetDeclaringClass(); + SirtRef<Class> declaringClass(self, method->GetDeclaringClass()); if (UNLIKELY(!declaringClass->IsInitializing())) { if (UNLIKELY(!Runtime::Current()->GetClassLinker()->EnsureInitialized(declaringClass, true, true))) { |