diff options
| author | Andreas Gampe <agampe@google.com> | 2014-08-06 22:58:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-06 17:20:04 +0000 |
| commit | 269c3360f8e69e9faf8bc8a51fd87ae7adadfb59 (patch) | |
| tree | e6b96c5a139999feb13176f6a12f034cba6dd9f5 /runtime/entrypoints/entrypoint_utils-inl.h | |
| parent | 2524ffd731a3d173c9b0ad8f7b3e4a89d692aab6 (diff) | |
| parent | 58a5af8568d224ca7eccf2483396ff9862f8d1ee (diff) | |
| download | art-269c3360f8e69e9faf8bc8a51fd87ae7adadfb59.zip art-269c3360f8e69e9faf8bc8a51fd87ae7adadfb59.tar.gz art-269c3360f8e69e9faf8bc8a51fd87ae7adadfb59.tar.bz2 | |
Merge "ART: Add guards to the dex cache and its shortcuts"
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils-inl.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index 7c73c79..b874a74 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -41,7 +41,7 @@ ALWAYS_INLINE static inline mirror::Class* CheckObjectAlloc(uint32_t type_idx, mirror::ArtMethod* method, Thread* self, bool* slow_path) { - mirror::Class* klass = method->GetDexCacheResolvedTypes()->GetWithoutChecks(type_idx); + mirror::Class* klass = method->GetDexCacheResolvedType<false>(type_idx); if (UNLIKELY(klass == NULL)) { klass = Runtime::Current()->GetClassLinker()->ResolveType(type_idx, method); *slow_path = true; @@ -184,7 +184,7 @@ static inline mirror::Class* CheckArrayAlloc(uint32_t type_idx, *slow_path = true; return nullptr; // Failure } - mirror::Class* klass = method->GetDexCacheResolvedTypes()->GetWithoutChecks(type_idx); + mirror::Class* klass = method->GetDexCacheResolvedType<false>(type_idx); if (UNLIKELY(klass == nullptr)) { // Not in dex cache so try to resolve klass = Runtime::Current()->GetClassLinker()->ResolveType(type_idx, method); *slow_path = true; |