commit dfb325e0ddd746cd8f7c2e3723b3a573eb7cc111
author Ian Rogers <irogers@google.com> Wed Oct 30 01:00:44 2013 -0700
committer Ian Rogers <irogers@google.com> Wed Oct 30 01:00:44 2013 -0700
tree 0b63738b04404f42015da7164dfe5ec506452b02
parent eda6df7374bf61c933d4a36635e2a9a30c9892a0

Don't use UTF16 length as length for MUTF8.

Bug 11367555.

Change-Id: Ia0b07072a1a49d435c3b71ed9a668b316b7ff5d8

runtime/mirror/class.cc

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 319ca4a..f3cb54a 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -135,7 +135,7 @@
   if (name != NULL) {
     return name;
   }
-  std::string descriptor(ClassHelper(this).GetDescriptorAsStringPiece().as_string());
+  std::string descriptor(ClassHelper(this).GetDescriptor());
   if ((descriptor[0] != 'L') && (descriptor[0] != '[')) {
     // The descriptor indicates that this is the class for
     // a primitive type; special-case the return value.
@@ -294,8 +294,8 @@
     return true;
   }
   // Compare the package part of the descriptor string.
-  return IsInSamePackage(ClassHelper(klass1).GetDescriptorAsStringPiece(),
-                         ClassHelper(klass2).GetDescriptorAsStringPiece());
+  return IsInSamePackage(ClassHelper(klass1).GetDescriptor(),
+                         ClassHelper(klass2).GetDescriptor());
 }
 
 bool Class::IsClassClass() const {
@@ -366,7 +366,7 @@
   for (size_t i = 0; i < NumDirectMethods(); ++i) {
     ArtMethod* method = GetDirectMethod(i);
     mh.ChangeMethod(method);
-    if (name == mh.GetNameAsStringPiece() && mh.GetSignature() == signature) {
+    if (name == mh.GetName() && mh.GetSignature() == signature) {
       return method;
     }
   }
@@ -378,7 +378,7 @@
   for (size_t i = 0; i < NumDirectMethods(); ++i) {
     ArtMethod* method = GetDirectMethod(i);
     mh.ChangeMethod(method);
-    if (name == mh.GetNameAsStringPiece() && signature == mh.GetSignature()) {
+    if (name == mh.GetName() && signature == mh.GetSignature()) {
       return method;
     }
   }
@@ -432,7 +432,7 @@
   for (size_t i = 0; i < NumVirtualMethods(); ++i) {
     ArtMethod* method = GetVirtualMethod(i);
     mh.ChangeMethod(method);
-    if (name == mh.GetNameAsStringPiece() && mh.GetSignature() == signature) {
+    if (name == mh.GetName() && mh.GetSignature() == signature) {
       return method;
     }
   }
@@ -445,7 +445,7 @@
   for (size_t i = 0; i < NumVirtualMethods(); ++i) {
     ArtMethod* method = GetVirtualMethod(i);
     mh.ChangeMethod(method);
-    if (name == mh.GetNameAsStringPiece() && signature == mh.GetSignature()) {
+    if (name == mh.GetName() && signature == mh.GetSignature()) {
       return method;
     }
   }
@@ -517,7 +517,7 @@
   for (size_t i = 0; i < NumInstanceFields(); ++i) {
     ArtField* f = GetInstanceField(i);
     fh.ChangeField(f);
-    if (name == fh.GetNameAsStringPiece() && type == fh.GetTypeDescriptorAsStringPiece()) {
+    if (name == fh.GetName() && type == fh.GetTypeDescriptor()) {
       return f;
     }
   }
@@ -566,7 +566,7 @@
   for (size_t i = 0; i < NumStaticFields(); ++i) {
     ArtField* f = GetStaticField(i);
     fh.ChangeField(f);
-    if (name == fh.GetNameAsStringPiece() && type == fh.GetTypeDescriptorAsStringPiece()) {
+    if (name == fh.GetName() && type == fh.GetTypeDescriptor()) {
       return f;
     }
   }