diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-09 17:50:29 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-11 14:25:14 -0700 |
| commit | fac3a390a247fe33d4873773d742aad4cc100118 (patch) | |
| tree | cbb28b86470827e42d919e144efc914296c799ee /runtime/class_linker.cc | |
| parent | 21cb657159b3e93cc888685ade83f8fc519290be (diff) | |
| download | android_art-fac3a390a247fe33d4873773d742aad4cc100118.tar.gz android_art-fac3a390a247fe33d4873773d742aad4cc100118.tar.bz2 android_art-fac3a390a247fe33d4873773d742aad4cc100118.zip | |
Move image intern table into image
Previously we recreated this intern table during runtime startup.
This added 50-100ms of boot time.
Fixed bug where we didn't copy over hashcodes into the image.
Deleted some stale code.
Bug: 20727525
Bug: 19569780
Change-Id: I08959e9aa2a73cedb52f393033e2ffea3a26e76b
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 2a0e4e8f68..91812e728c 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1055,7 +1055,7 @@ static void SanityCheckArtMethodPointerArray( static void SanityCheckObjectsCallback(mirror::Object* obj, void* arg ATTRIBUTE_UNUSED) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { DCHECK(obj != nullptr); - CHECK(obj->GetClass() != nullptr) << "Null class " << obj; + CHECK(obj->GetClass() != nullptr) << "Null class in object " << obj; CHECK(obj->GetClass()->GetClass() != nullptr) << "Null class class " << obj; if (obj->IsClass()) { auto klass = obj->AsClass(); |