Fix recursive static field lookup.
Change-Id: I892696e6e98be9f31a7900d10130cae204f9127a
diff --git a/src/object_utils.h b/src/object_utils.h
index ceef186..c186a24 100644
--- a/src/object_utils.h
+++ b/src/object_utils.h
@@ -126,7 +126,7 @@
return result;
}
- uint32_t NumInterfaces() {
+ uint32_t NumDirectInterfaces() {
DCHECK(klass_ != NULL);
if (klass_->IsPrimitive()) {
return 0;
@@ -144,14 +144,14 @@
}
}
- 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 @@
} 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_);