summaryrefslogtreecommitdiff
path: root/runtime/class_linker.h
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2017-01-16 20:52:19 +0000
committer Vladimir Marko <vmarko@google.com> 2017-01-17 16:12:15 +0000
commit942fd3130254d8276cbfe8e6201825e9c49e9b2c (patch)
tree62dbcd85ab150604e2d72a3c2d0c3639a28c9b7a /runtime/class_linker.h
parent8bd59a0fd46db83616785168231e09fb95ed2ead (diff)
Reduce using ArtMethod's dex_cache_resolved_types_.
Avoid using the ArtMethod's dex cache type array shortcut in runtime, preparing for its removal. We do not completely remove the shortcut yet because it is still used by array allocation entrypoints. Fix ArgArray::BuildArgArrayFromObjectArray in reflection.cc to not ask for the parameter type to be resolved. It should have been previously resolved when retrieving the Method. Also partially revert https://android-review.googlesource.com/310717 because it relied on the removed AIOOBE check in the removed ArtMethod::GetDexCacheResolvedType(). The removed check was simply defensive but it could not be triggered without some memory corruption. Test: m test-art-host Bug: 30627598 Change-Id: Ic45a5ff8c66b79429e440cbc08d67bf22a083682
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r--runtime/class_linker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 580acb7068..7b81bcaa54 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -653,7 +653,7 @@ class ClassLinker {
// jweak decode that triggers read barriers (and mark them alive unnecessarily and mess with
// class unloading.)
const DexFile* dex_file;
- GcRoot<mirror::Class>* resolved_types;
+ ArtMethod** resolved_methods;
};
private: