diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 22:06:51 +0000 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-22 22:06:51 +0000 |
| commit | 3bdb873122964da7937eb070cbcf2ef638a8e459 (patch) | |
| tree | 3d29123f33853e11adb67bdd6ac56f19ee798a1f /runtime/native | |
| parent | e09ae0920be57760fb390b6944bce420fa0b5582 (diff) | |
| download | art-3bdb873122964da7937eb070cbcf2ef638a8e459.zip art-3bdb873122964da7937eb070cbcf2ef638a8e459.tar.gz art-3bdb873122964da7937eb070cbcf2ef638a8e459.tar.bz2 | |
Revert "Fix an outstanding compaction bug in interpreter."
This reverts commit e09ae0920be57760fb390b6944bce420fa0b5582.
Change-Id: I48036306130d5ccfec683d0dc3e9a642a02ee9c1
Diffstat (limited to 'runtime/native')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index d55b545..d9c9b59 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,7 +267,8 @@ 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); @@ -295,7 +296,8 @@ static void PreloadDexCachesResolveField(Handle<mirror::DexCache> dex_cache, uin } // 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); |