Clean up descriptor and member name comparisons.

Add helper functions for these comparisons to keep comments
related to ordering in one place.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I510a1cbbb46a22ddbd39d0530198cd004b476a8d

1 files changed, 2 insertions, 2 deletions

diff --git a/libdexfile/dex/proto_reference.h b/libdexfile/dex/proto_reference.h
index dc9a447e63..a12091cc46 100644
--- a/libdexfile/dex/proto_reference.h
+++ b/libdexfile/dex/proto_reference.h
@@ -62,7 +62,7 @@ struct ProtoReferenceValueComparator {
     // Compare return type first.
     const dex::ProtoId& prid1 = lhs.ProtoId();
     const dex::ProtoId& prid2 = rhs.ProtoId();
-    int return_type_diff = lhs.ReturnType().compare(rhs.ReturnType());
+    int return_type_diff = DexFile::CompareDescriptors(lhs.ReturnType(), rhs.ReturnType());
     if (return_type_diff != 0) {
       return return_type_diff < 0;
     }
@@ -77,7 +77,7 @@ struct ProtoReferenceValueComparator {
       std::string_view r_param = rhs.dex_file->GetTypeDescriptorView(
           rhs.dex_file->GetTypeId(params2->GetTypeItem(i).type_idx_));
 
-      int param_diff = l_param.compare(r_param);
+      int param_diff = DexFile::CompareDescriptors(l_param, r_param);
       if (param_diff != 0) {
         return param_diff < 0;
       }