Change Shrinking and obfuscation behavior depending on seeds

Use the SeedFinder markers as starting point for shrinking
and obfuscation tracing.

Change-Id: I4a3aecd89edf80fe71a931e14cee5aa4638040e4

24 files changed, 51 insertions, 28 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsFlattenPackage/expected-001.txt
index 4f0bf00..515afa6 100644
--- a/jack-tests/tests/com/android/jack/shrob/test022/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test022/refsFlattenPackage/expected-001.txt
@@ -3,3 +3,4 @@ com.android.jack.shrob.test022.jack.Shrob022 -> com.android.jack.shrob.test022.j
     void method() -> method
 com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.NoghfnphPyngg:
     void <init>() -> <init>
+    void method() -> method
diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt
index 21d2582..7cc20ee 100644
--- a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithMapping/expected-001.txt
@@ -3,3 +3,4 @@ com.android.jack.shrob.test022.jack.Shrob022 -> com.android.jack.shrob.test022.j
     void method() -> method
 com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.RenamedAbstractClass:
     void <init>() -> <init>
+    void method() -> method
diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithoutMapping/expected-001.txt
index 4f0bf00..515afa6 100644
--- a/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test022/refsObfuscationWithoutMapping/expected-001.txt
@@ -3,3 +3,4 @@ com.android.jack.shrob.test022.jack.Shrob022 -> com.android.jack.shrob.test022.j
     void method() -> method
 com.android.jack.shrob.test022.jack.AbstractClass -> com.android.jack.shrob.test022.jack.NoghfnphPyngg:
     void <init>() -> <init>
+    void method() -> method
diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsRepackageClasses/expected-001.txt
index ef95c4b..9f92a6e 100644
--- a/jack-tests/tests/com/android/jack/shrob/test022/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test022/refsRepackageClasses/expected-001.txt
@@ -3,3 +3,4 @@ com.android.jack.shrob.test022.jack.Shrob022 -> com.android.jack.shrob.test022.j
     void method() -> method
 com.android.jack.shrob.test022.jack.AbstractClass -> NoghfnphPyngg:
     void <init>() -> <init>
+    void method() -> method
diff --git a/jack-tests/tests/com/android/jack/shrob/test022/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test022/refsShrinking/expected-001.txt
index 8555379..9904248 100644
--- a/jack-tests/tests/com/android/jack/shrob/test022/refsShrinking/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test022/refsShrinking/expected-001.txt
@@ -3,3 +3,4 @@ Lcom/android/jack/shrob/test022/jack/Shrob022;:
 method()V
 Lcom/android/jack/shrob/test022/jack/AbstractClass;:
 <init>()V
+method()V
diff --git a/jack-tests/tests/com/android/jack/shrob/test030/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test030/refsFlattenPackage/expected-001.txt
index d6ac978..0154a1b 100644
--- a/jack-tests/tests/com/android/jack/shrob/test030/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test030/refsFlattenPackage/expected-001.txt
@@ -2,9 +2,9 @@ com.android.jack.shrob.test030.jack.Kept -> com.android.jack.shrob.test030.jack.
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test030.jack.I) -> kept
 com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test030.jack.B -> com.android.jack.shrob.test030.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithoutMapping/expected-001.txt
index d6ac978..0154a1b 100644
--- a/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test030/refsObfuscationWithoutMapping/expected-001.txt
@@ -2,9 +2,9 @@ com.android.jack.shrob.test030.jack.Kept -> com.android.jack.shrob.test030.jack.
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test030.jack.I) -> kept
 com.android.jack.shrob.test030.jack.I -> com.android.jack.shrob.test030.jack.V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test030.jack.B -> com.android.jack.shrob.test030.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test030.jack.A -> com.android.jack.shrob.test030.jack.N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test030/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test030/refsRepackageClasses/expected-001.txt
index 33ab2e4..0625872 100644
--- a/jack-tests/tests/com/android/jack/shrob/test030/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test030/refsRepackageClasses/expected-001.txt
@@ -1,10 +1,10 @@
 com.android.jack.shrob.test030.jack.A -> N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test030.jack.B -> com.android.jack.shrob.test030.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test030.jack.I -> V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test030.jack.Kept -> com.android.jack.shrob.test030.jack.Kept:
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test030.jack.I) -> kept
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping
index 6a76a4c..024f87b 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping
+++ b/jack-tests/tests/com/android/jack/shrob/test031/proguard.flags002.mapping
@@ -3,14 +3,14 @@ com.android.jack.shrob.test031.jack.E -> com.android.jack.shrob.test031.jack.E:
 com.android.jack.shrob.test031.jack.Kept -> com.android.jack.shrob.test031.jack.Kept:
 	void <init>() -> <init>
 	int kept(com.android.jack.shrob.test031.jack.I) -> kept
-com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.a:
-	int m() -> a
-com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.b:
+com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.renamedI:
+	int m() -> renamedM
+com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.renamedF:
 	void <init>() -> <init>
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
 	void <init>() -> <init>
 com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D:
 	void <init>() -> <init>
-com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.c:
+com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.renamedA:
 	void <init>() -> <init>
-	int m() -> a
+	int m() -> renamedM
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-001.txt
index 7570bf5..c0df9ef 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-001.txt
@@ -4,13 +4,14 @@ com.android.jack.shrob.test031.jack.Kept -> com.android.jack.shrob.test031.jack.
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test031.jack.I) -> kept
 com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt
index 0b53802..878703d 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsFlattenPackage/expected-002.txt
@@ -1,6 +1,8 @@
 com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N:
     void <init>() -> <init>
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt
index 89eb0ed..838e378 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-001.txt
@@ -7,6 +7,7 @@ com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.Ren
     int m() -> renamedM
 com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.RenamedF:
     void <init>() -> <init>
+    int m() -> renamedM
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D:
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt
index 4f2a835..8ff458d 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithMapping/expected-002.txt
@@ -1,6 +1,8 @@
-com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.b:
+com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.renamedF:
     void <init>() -> <init>
+    int m() -> renamedM
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
-com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.c:
+com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.renamedA:
     void <init>() -> <init>
+    int m() -> renamedM
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-001.txt
index 7570bf5..c0df9ef 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-001.txt
@@ -4,13 +4,14 @@ com.android.jack.shrob.test031.jack.Kept -> com.android.jack.shrob.test031.jack.
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test031.jack.I) -> kept
 com.android.jack.shrob.test031.jack.I -> com.android.jack.shrob.test031.jack.V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt
index 0b53802..878703d 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsObfuscationWithoutMapping/expected-002.txt
@@ -1,6 +1,8 @@
 com.android.jack.shrob.test031.jack.F -> com.android.jack.shrob.test031.jack.S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.A -> com.android.jack.shrob.test031.jack.N:
     void <init>() -> <init>
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-001.txt
index 37ff366..5f4c709 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-001.txt
@@ -1,12 +1,13 @@
 com.android.jack.shrob.test031.jack.A -> N:
     void <init>() -> <init>
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.F -> S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.I -> V:
-    int m() -> z__
+    int m() -> m
 com.android.jack.shrob.test031.jack.D -> com.android.jack.shrob.test031.jack.D:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.Kept -> com.android.jack.shrob.test031.jack.Kept:
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt
index 42e2adf..8c40312 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsRepackageClasses/expected-002.txt
@@ -1,6 +1,8 @@
 com.android.jack.shrob.test031.jack.F -> S:
     void <init>() -> <init>
+    int m() -> m
 com.android.jack.shrob.test031.jack.B -> com.android.jack.shrob.test031.jack.B:
     void <init>() -> <init>
 com.android.jack.shrob.test031.jack.A -> N:
     void <init>() -> <init>
+    int m() -> m
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-001.txt
index d2759db..898bda0 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-001.txt
@@ -14,3 +14,4 @@ Lcom/android/jack/shrob/test031/jack/B;:
 <init>()V
 Lcom/android/jack/shrob/test031/jack/F;:
 <init>()V
+m()I
diff --git a/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt
index c09949f..d02b62f 100644
--- a/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test031/refsShrinking/expected-002.txt
@@ -1,6 +1,8 @@
 Lcom/android/jack/shrob/test031/jack/F;:
 <init>()V
+m()I
 Lcom/android/jack/shrob/test031/jack/B;:
 <init>()V
 Lcom/android/jack/shrob/test031/jack/A;:
-<init>()V
\ No newline at end of file
+<init>()V
+m()I
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping
index 8b692a9..a6c1c62 100644
--- a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping
+++ b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping
@@ -6,3 +6,6 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.Ren
     void <init>(java.lang.String,int) -> renamed<init>
     com.android.jack.shrob.test036.jack.E[] values() -> renamedValues
     void <clinit>() -> renamed<clinit>
+    com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept:
+    int[] -ESwitchesValues -> renamed-ESwitchesValues
+    int[] -getESwitchesValues() -> renamed-getESwitchesValues()
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt
index 68f2144..2a374d2 100644
--- a/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt
@@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.R:
     com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__
     void <clinit>() -> <clinit>
 com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept:
-    int[] -ESwitchesValues -> -ESwitchesValues
+    int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test036.jack.E) -> kept
-    int[] -getESwitchesValues() -> -getESwitchesValues
+    int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt
index 1d7594a..9cf0d78 100644
--- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt
@@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.Ren
     com.android.jack.shrob.test036.jack.E[] values() -> renamedValues
     void <clinit>() -> <clinit>
 com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept:
-    int[] -ESwitchesValues -> -ESwitchesValues
+    int[] -ESwitchesValues -> renamed-ESwitchesValues
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test036.jack.E) -> kept
-    int[] -getESwitchesValues() -> -getESwitchesValues
+    int[] -getESwitchesValues() -> renamed-getESwitchesValues()
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt
index 68f2144..2a374d2 100644
--- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt
@@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.R:
     com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__
     void <clinit>() -> <clinit>
 com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept:
-    int[] -ESwitchesValues -> -ESwitchesValues
+    int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test036.jack.E) -> kept
-    int[] -getESwitchesValues() -> -getESwitchesValues
+    int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt
index 2f704ff..db22cbd 100644
--- a/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt
+++ b/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt
@@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> R:
     com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__
     void <clinit>() -> <clinit>
 com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept:
-    int[] -ESwitchesValues -> -ESwitchesValues
+    int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V
     void <init>() -> <init>
     int kept(com.android.jack.shrob.test036.jack.E) -> kept
-    int[] -getESwitchesValues() -> -getESwitchesValues
+    int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__