diff options
author | 2012-06-06 21:21:43 -0700 | |
---|---|---|
committer | 2012-06-06 22:57:13 -0700 | |
commit | d24e264ff85ad8c6f142ac6d33055fdc1881fa2f (patch) | |
tree | 37e1ba1dd328828205e5c9340ae64eddd915a154 /src/object_utils.h | |
parent | d06dfe7b09de95c035fa736d2b62aa9fee2347b5 (diff) |
Fix recursive static field lookup.
Change-Id: I892696e6e98be9f31a7900d10130cae204f9127a
Diffstat (limited to 'src/object_utils.h')
-rw-r--r-- | src/object_utils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object_utils.h b/src/object_utils.h index ceef18621d..c186a243e3 100644 --- a/src/object_utils.h +++ b/src/object_utils.h @@ -126,7 +126,7 @@ class ClassHelper { return result; } - uint32_t NumInterfaces() { + uint32_t NumDirectInterfaces() { DCHECK(klass_ != NULL); if (klass_->IsPrimitive()) { return 0; @@ -144,14 +144,14 @@ class ClassHelper { } } - uint16_t GetInterfaceTypeIdx(uint32_t idx) { + uint16_t GetDirectInterfaceTypeIdx(uint32_t idx) { DCHECK(klass_ != NULL); DCHECK(!klass_->IsPrimitive()); DCHECK(!klass_->IsArrayClass()); return GetInterfaceTypeList()->GetTypeItem(idx).type_idx_; } - Class* GetInterface(uint32_t idx) { + Class* GetDirectInterface(uint32_t idx) { DCHECK(klass_ != NULL); DCHECK(!klass_->IsPrimitive()); if (klass_->IsArrayClass()) { @@ -164,7 +164,7 @@ class ClassHelper { } else if (klass_->IsProxyClass()) { return klass_->GetIfTable()->Get(idx)->GetInterface(); } else { - uint16_t type_idx = GetInterfaceTypeIdx(idx); + uint16_t type_idx = GetDirectInterfaceTypeIdx(idx); Class* interface = GetDexCache()->GetResolvedType(type_idx); if (interface == NULL) { interface = GetClassLinker()->ResolveType(GetDexFile(), type_idx, klass_); |