commit f6ed24d0e387c29c74829636901a09f4d02d2582
author Tamas Kenez <tamaskenez@google.com> Tue Jun 27 12:59:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 27 12:59:02 2017 +0000
tree 092f8d8bc14192c04c49273fae6505dbd4cf9631
parent f2fb4661f1907134015831f013adf941a36ae647
parent 4bdd42166a553f416820a673f73df09533565869

Merge "Make dex segment type names UpperCamelCase."

src/main/java/com/android/tools/r8/dex/Segment.java

diff --git a/src/main/java/com/android/tools/r8/dex/Segment.java b/src/main/java/com/android/tools/r8/dex/Segment.java
index 1d18347..0d782d6 100644
--- a/src/main/java/com/android/tools/r8/dex/Segment.java
+++ b/src/main/java/com/android/tools/r8/dex/Segment.java
@@ -27,6 +27,8 @@
   }
 
   public String typeName() {
+    // Type names are in UpperCamelCase because they're used as labels in
+    // benchmarks.
     switch (type) {
       case Constants.TYPE_HEADER_ITEM:
         return "Header";
@@ -41,29 +43,29 @@
       case Constants.TYPE_METHOD_ID_ITEM:
         return "Methods";
       case Constants.TYPE_CLASS_DEF_ITEM:
-        return "Class defs";
+        return "ClassDefs";
       case Constants.TYPE_MAP_LIST:
         return "Maps";
       case Constants.TYPE_TYPE_LIST:
-        return "Type lists";
+        return "TypeLists";
       case Constants.TYPE_ANNOTATION_SET_REF_LIST:
-        return "Annotation set refs";
+        return "AnnotationSetRefs";
       case Constants.TYPE_ANNOTATION_SET_ITEM:
-        return "Annotation sets";
+        return "AnnotationSets";
       case Constants.TYPE_CLASS_DATA_ITEM:
-        return "Class data";
+        return "ClassData";
       case Constants.TYPE_CODE_ITEM:
         return "Code";
       case Constants.TYPE_STRING_DATA_ITEM:
-        return "String data";
+        return "StringData";
       case Constants.TYPE_DEBUG_INFO_ITEM:
-        return "Debug info";
+        return "DebugInfo";
       case Constants.TYPE_ANNOTATION_ITEM:
         return "Annotation";
       case Constants.TYPE_ENCODED_ARRAY_ITEM:
-        return "Encoded arrays";
+        return "EncodedArrays";
       case Constants.TYPE_ANNOTATIONS_DIRECTORY_ITEM:
-        return "Annotations directory";
+        return "AnnotationsDirectory";
       default:
         return "Unknown";
     }