commit 2ed52c4419dd537c98cd7898bc8bdcf8826b8940
author Elliott Hughes <enh@google.com> Wed Mar 21 16:56:56 2012 -0700
committer Elliott Hughes <enh@google.com> Wed Mar 21 16:57:43 2012 -0700
tree e90598e39df514d8a86cbb160288b4fd563eb1c1
parent 051c9fc1de07bbc265af38cf60f061394163c68f

Stash the directly-implemented interfaces in Proxy so we can implement Class.getInterfaces.

Also extend test 044 to spot this (found by a libcore test).

Change-Id: I50019db49c549f045d94173c3ed9ae81f05ef858

src/object_utils.h

diff --git a/src/object_utils.h b/src/object_utils.h
index b9d8a24..cbad7b0 100644
--- a/src/object_utils.h
+++ b/src/object_utils.h
@@ -249,32 +249,28 @@
   }
   const char* GetName() {
     uint32_t field_index = field_->GetDexFieldIndex();
-    if (field_index != DexFile::kDexNoIndex) {
+    if (!field_->GetDeclaringClass()->IsProxyClass()) {
       const DexFile& dex_file = GetDexFile();
       return dex_file.GetFieldName(dex_file.GetFieldId(field_index));
     } else {
-      // Proxy classes have a single static field called "throws"
-      CHECK(field_->GetDeclaringClass()->IsProxyClass());
       DCHECK(field_->IsStatic());
-      return "throws";
+      DCHECK_LT(field_index, 2U);
+      return field_index == 0 ? "interfaces" : "throws";
     }
   }
   String* GetNameAsString() {
     uint32_t field_index = field_->GetDexFieldIndex();
-    if (field_index != DexFile::kDexNoIndex) {
+    if (!field_->GetDeclaringClass()->IsProxyClass()) {
       const DexFile& dex_file = GetDexFile();
       const DexFile::FieldId& field_id = dex_file.GetFieldId(field_index);
       return GetClassLinker()->ResolveString(dex_file, field_id.name_idx_, GetDexCache());
     } else {
-      // Proxy classes have a single static field called "throws"
-      CHECK(field_->GetDeclaringClass()->IsProxyClass());
-      DCHECK(field_->IsStatic());
-      return Runtime::Current()->GetInternTable()->InternStrong("throws");
+      return Runtime::Current()->GetInternTable()->InternStrong(GetName());
     }
   }
   Class* GetType() {
     uint32_t field_index = field_->GetDexFieldIndex();
-    if (field_index != DexFile::kDexNoIndex) {
+    if (!field_->GetDeclaringClass()->IsProxyClass()) {
       const DexFile& dex_file = GetDexFile();
       const DexFile::FieldId& field_id = dex_file.GetFieldId(field_index);
       Class* type = GetDexCache()->GetResolvedType(field_id.type_idx_);
@@ -284,23 +280,20 @@
       }
       return type;
     } else {
-      // Proxy classes have a single static field called "throws" whose type is Class[][]
-      CHECK(field_->GetDeclaringClass()->IsProxyClass());
-      DCHECK(field_->IsStatic());
-      return GetClassLinker()->FindSystemClass("[[Ljava/lang/Class;");
+      return GetClassLinker()->FindSystemClass(GetTypeDescriptor());
     }
   }
   const char* GetTypeDescriptor() {
     uint32_t field_index = field_->GetDexFieldIndex();
-    if (field_index != DexFile::kDexNoIndex) {
+    if (!field_->GetDeclaringClass()->IsProxyClass()) {
       const DexFile& dex_file = GetDexFile();
       const DexFile::FieldId& field_id = dex_file.GetFieldId(field_index);
       return dex_file.GetFieldTypeDescriptor(field_id);
     } else {
-      // Proxy classes have a single static field called "throws" whose type is Class[][]
-      CHECK(field_->GetDeclaringClass()->IsProxyClass());
       DCHECK(field_->IsStatic());
-      return "[[Ljava/lang/Class;";
+      DCHECK_LT(field_index, 2U);
+      // 0 == Class[] interfaces; 1 == Class[][] throws;
+      return field_index == 0 ? "[Ljava/lang/Class;" : "[[Ljava/lang/Class;";
     }
   }
   Primitive::Type GetTypeAsPrimitiveType() {