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

compiler/dex/quick/gen_invoke.cc

diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index 62feade..5a1d3d1 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -1232,7 +1232,7 @@
   const DexFile::MethodId& target_mid = cu_->dex_file->GetMethodId(info->index);
   const DexFile::TypeId& declaring_type = cu_->dex_file->GetTypeId(target_mid.class_idx_);
   StringPiece tgt_methods_declaring_class(
-      cu_->dex_file->StringDataAsStringPieceByIdx(declaring_type.descriptor_idx_));
+      cu_->dex_file->StringDataByIdx(declaring_type.descriptor_idx_));
   if (tgt_methods_declaring_class.starts_with("Ljava/lang/Double;")) {
     std::string tgt_method(PrettyMethod(info->index, *cu_->dex_file));
     if (tgt_method == "long java.lang.Double.doubleToRawLongBits(double)") {