commit 40381fb9dc4b4cf274f1e58b2cdf4396202c6189
author Brian Carlstrom <bdc@google.com> Wed Oct 19 14:13:40 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Oct 20 12:19:25 2011 -0700
tree 8281b105d3e8a0850984f0ee182db01c33613f27
parent b06631143b944388fc68bedf6679c006dde5f461

Reuse SIRT for C++ references

Change-Id: I8310e55da42f55f7ec60f6b17face436c77a979f

src/dex_file.h

diff --git a/src/dex_file.h b/src/dex_file.h
index f41040e..070901b 100644
--- a/src/dex_file.h
+++ b/src/dex_file.h
@@ -575,8 +575,6 @@
     return dexStringById(idx, &unicode_length);
   }
 
-  String* dexArtStringById(int32_t idx) const;
-
   // Get the descriptor string associated with a given type index.
   const char* dexStringByTypeIdx(uint32_t idx, int32_t* unicode_length) const {
     const TypeId& type_id = GetTypeId(idx);
@@ -588,11 +586,6 @@
     return dexStringById(type_id.descriptor_idx_);
   }
 
-  String* dexArtStringByTypeIdx(int32_t idx) const {
-    const TypeId& type_id = GetTypeId(idx);
-    return dexArtStringById(type_id.descriptor_idx_);
-  }
-
   // TODO: encoded_field is actually a stream of bytes
   void dexReadClassDataField(const byte** encoded_field,
                              DexFile::Field* field,
@@ -712,9 +705,9 @@
   typedef void (*DexDebugNewLocalCb)(void* cnxt, uint16_t reg,
                                      uint32_t startAddress,
                                      uint32_t endAddress,
-                                     const String* name,
-                                     const String* descriptor,
-                                     const String* signature);
+                                     const char* name,
+                                     const char* descriptor,
+                                     const char* signature);
 
   static bool LineNumForPcCb(void* cnxt, uint32_t address, uint32_t line_num) {
     LineNumFromPcContext* context = (LineNumFromPcContext*) cnxt;
@@ -751,16 +744,16 @@
   };
 
   struct LocalInfo {
-    LocalInfo() : name_(NULL), descriptor_(NULL), signature_(NULL), start_address_(0), is_live_(false) {}
+    LocalInfo() : name_(NULL), start_address_(0), is_live_(false) {}
 
     // E.g., list
-    const String* name_;
+    const char* name_;
 
     // E.g., Ljava/util/LinkedList;
-    const String* descriptor_;
+    const char* descriptor_;
 
     // E.g., java.util.LinkedList<java.lang.Integer>
-    const String* signature_;
+    const char* signature_;
 
     // PC location where the local is first defined.
     uint16_t start_address_;