diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 16:48:55 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-23 12:55:45 -0700 |
| commit | 0cd81352a7c06e381951cea1b104fd73516f4341 (patch) | |
| tree | fcc8ff9cdeb608d0913097aa1fb64d1879f11ffa /runtime/native/dalvik_system_VMRuntime.cc | |
| parent | dfd301f19800a4f168283cf2d0b15b2c09071955 (diff) | |
| download | art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.gz art-0cd81352a7c06e381951cea1b104fd73516f4341.tar.bz2 art-0cd81352a7c06e381951cea1b104fd73516f4341.zip | |
Revert "Revert "Fix an outstanding compaction bug in interpreter.""
Fixed the generic trampoline to not use ToJObject when unnecessary.
Bug: 15167269
This reverts commit 3bdb873122964da7937eb070cbcf2ef638a8e459.
Change-Id: I0525d0e0f3afb753c770e1572070a0fa22b02271
Diffstat (limited to 'runtime/native/dalvik_system_VMRuntime.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index d9c9b5937d..d55b5450c3 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -221,7 +221,7 @@ static void PreloadDexCachesStringsCallback(mirror::Object** root, void* arg, } // Based on ClassLinker::ResolveString. -static void PreloadDexCachesResolveString(Handle<mirror::DexCache>& dex_cache, uint32_t string_idx, +static void PreloadDexCachesResolveString(Handle<mirror::DexCache> dex_cache, uint32_t string_idx, StringTable& strings) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { mirror::String* string = dex_cache->GetResolvedString(string_idx); @@ -267,8 +267,7 @@ static void PreloadDexCachesResolveType(mirror::DexCache* dex_cache, uint32_t ty } // Based on ClassLinker::ResolveField. -static void PreloadDexCachesResolveField(Handle<mirror::DexCache>& dex_cache, - uint32_t field_idx, +static void PreloadDexCachesResolveField(Handle<mirror::DexCache> dex_cache, uint32_t field_idx, bool is_static) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { mirror::ArtField* field = dex_cache->GetResolvedField(field_idx); @@ -296,8 +295,7 @@ static void PreloadDexCachesResolveField(Handle<mirror::DexCache>& dex_cache, } // Based on ClassLinker::ResolveMethod. -static void PreloadDexCachesResolveMethod(Handle<mirror::DexCache>& dex_cache, - uint32_t method_idx, +static void PreloadDexCachesResolveMethod(Handle<mirror::DexCache> dex_cache, uint32_t method_idx, InvokeType invoke_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { mirror::ArtMethod* method = dex_cache->GetResolvedMethod(method_idx); |