commit d24e264ff85ad8c6f142ac6d33055fdc1881fa2f
author Ian Rogers <irogers@google.com> Wed Jun 06 21:21:43 2012 -0700
committer Ian Rogers <irogers@google.com> Wed Jun 06 22:57:13 2012 -0700
tree 37e1ba1dd328828205e5c9340ae64eddd915a154
parent d06dfe7b09de95c035fa736d2b62aa9fee2347b5

Fix recursive static field lookup.

Change-Id: I892696e6e98be9f31a7900d10130cae204f9127a

src/object_utils.h

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_);