commit 419ec7bbcdbf56a9d2a9fd7f91f9ace279e0b664
author Carl Shapiro <cshapiro@google.com> Wed Aug 03 14:48:33 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Wed Aug 03 17:29:32 2011 -0700
tree ef7d735ef10e5b886db278bc6075d60f46ff0081
parent b0460eaa2cb131f1dbdd5a7217bd36b9a9f1b995

Materialize method descriptors when instantiating method objects.

Previously, when comparing method descriptors, one had to piecewise
compare the leaves of a method structure for equality.

With this change a flat method descriptor is computed and associated
to an object.  This will simplify comparisons for descriptor equality
used during verification and reflective method retrieval.

Change-Id: I91e5ac76fb3816a36716b34fe43d05cd7364897b

src/object.h

diff --git a/src/object.h b/src/object.h
index 7eede5d..3a9888e 100644
--- a/src/object.h
+++ b/src/object.h
@@ -382,6 +382,10 @@
     return java_name_;
   }
 
+  const String* GetDescriptor() const {
+    return descriptor_;
+  }
+
   Class* GetDeclaringClass() const {
     return declaring_class_;
   }
@@ -545,6 +549,18 @@
   // method name, e.g. "<init>" or "eatLunch"
   StringPiece name_;
 
+  // The method descriptor.  This represents the parameters a method
+  // takes and value it returns.  This string is a list of the type
+  // descriptors for the parameters enclosed in parenthesis followed
+  // by the return type descriptor.  For example, for the method
+  //
+  //   Object mymethod(int i, double d, Thread t)
+  //
+  // the method descriptor would be
+  //
+  //   (IDLjava/lang/Thread;)Ljava/lang/Object;
+  String* descriptor_;
+
   // Method prototype descriptor string (return and argument types).
   uint32_t proto_idx_;
 
@@ -781,6 +797,12 @@
     direct_methods_->Set(i, f);
   }
 
+  Method* FindDeclaredDirectMethod(const StringPiece& name,
+                                   const StringPiece& descriptor);
+
+  Method* FindDirectMethod(const StringPiece& name,
+                           const StringPiece& descriptor);
+
   // Returns the number of non-inherited virtual methods.
   size_t NumVirtualMethods() const {
     return (virtual_methods_ != NULL) ? virtual_methods_->GetLength() : 0;
@@ -796,6 +818,12 @@
     virtual_methods_->Set(i, f);
   }
 
+  Method* FindDeclaredVirtualMethod(const StringPiece& name,
+                                    const StringPiece& descriptor);
+
+  Method* FindVirtualMethod(const StringPiece& name,
+                            const StringPiece& descriptor);
+
   size_t NumInstanceFields() const {
     return (ifields_ != NULL) ? ifields_->GetLength() : 0;
   }
@@ -837,10 +865,6 @@
     reference_offsets_ = new_reference_offsets;
   }
 
-  Method* FindDirectMethod(const String* name) const;
-
-  Method* FindVirtualMethod(const String* name) const;
-
   size_t NumInterfaces() const {
     return (interfaces_ != NULL) ? interfaces_->GetLength() : 0;
   }
@@ -855,9 +879,6 @@
     interfaces_->Set(i, f);
   }
 
-  Method* FindDirectMethodLocally(const StringPiece& name,
-                                  const StringPiece& descriptor) const;
-
  public:  // TODO: private
   // leave space for instance data; we could access fields directly if
   // we freeze the definition of java/lang/Class