commit 2ed67398cdd94cbb11d7409f3e7264f07b69de01
author Brian Carlstrom <bdc@google.com> Fri Sep 09 14:53:28 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Sep 09 14:53:28 2011 -0700
tree 413d571a7ba4add63a2d4a71ace407e1de62dcb5
parent dbc0525b23653a425fcd7532d04eecc32d138b9d

Move Method shorty to managed heap

Change-Id: Iafd05502b498c823063d0603915a92db8c95f060

src/object.h

diff --git a/src/object.h b/src/object.h
index bc9ec7e..01ed500 100644
--- a/src/object.h
+++ b/src/object.h
@@ -643,14 +643,9 @@
 
   void SetName(String* new_name);
 
-  const char* GetShorty() const;
+  String* GetShorty() const;
 
-  void SetShorty(const char* new_shorty) {
-    DCHECK(NULL == GetFieldPtr<const char*>(
-        OFFSET_OF_OBJECT_MEMBER(Method, shorty_), false));
-    DCHECK_LE(1u, strlen(new_shorty));
-    SetFieldPtr(OFFSET_OF_OBJECT_MEMBER(Method, shorty_), new_shorty, false);
-  }
+  void SetShorty(String* new_shorty);
 
   const String* GetSignature() const;
 
@@ -838,11 +833,7 @@
   //       need to deal with it.
   //
   // The number of Args that should be supplied to this method
-  size_t NumArgs() const {
-    // "1 +" because the first in Args is the receiver.
-    // "- 1" because we don't count the return type.
-    return (IsStatic() ? 0 : 1) + strlen(GetShorty()) - 1;
-  }
+  size_t NumArgs() const;
 
   // The number of reference arguments to this method including implicit this
   // pointer.
@@ -1039,6 +1030,9 @@
   // Storage for mapping_table_
   const ByteArray* mapping_table_;
 
+  // The short-form method descriptor string.
+  String* shorty_;
+
   // 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
@@ -1102,9 +1096,6 @@
   // Offset of return PC within frame for compiled code (in bytes)
   size_t return_pc_offset_in_bytes_;
 
-  // The short-form method descriptor string. TODO: make String*
-  const char* shorty_;
-
   uint32_t java_slot_;
 
   static Class* java_lang_reflect_Method_;
@@ -2594,12 +2585,19 @@
 
 }
 
-inline const char* Method::GetShorty() const {
+inline String* Method::GetShorty() const {
   DCHECK(GetDeclaringClass()->IsLoaded());
-  return GetFieldPtr<const char*>(
+  return GetFieldObject<String*>(
       OFFSET_OF_OBJECT_MEMBER(Method, shorty_), false);
 }
 
+inline void Method::SetShorty(String* new_shorty) {
+  DCHECK(NULL == GetFieldObject<String*>(
+      OFFSET_OF_OBJECT_MEMBER(Method, shorty_), false));
+  DCHECK_LE(1, new_shorty->GetLength());
+  SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Method, shorty_), new_shorty, false);
+}
+
 inline const String* Method::GetSignature() const {
   DCHECK(GetDeclaringClass()->IsLoaded());
   const String* result =