commit 2ca7ffb0cde704e24344b9ec553fa314829d3195
author Rico Wind <ricow@google.com> Wed Jan 30 08:07:51 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 30 08:07:51 2019 +0000
tree f2b2ae9d8bb7db03eab943370be82c753c408988
parent 58a8bcf4f6c10df24a0733748d8f2455489c1310
parent 7397d3bb5ceac459edfed6f93d4697a47c3271f2

Merge "Fix ProguardMapReader assertion when we have synthesized methods"

src/main/java/com/android/tools/r8/optimize/ClassAndMemberPublicizer.java

diff --git a/src/main/java/com/android/tools/r8/optimize/ClassAndMemberPublicizer.java b/src/main/java/com/android/tools/r8/optimize/ClassAndMemberPublicizer.java
index d3f336f..fc48225 100644
--- a/src/main/java/com/android/tools/r8/optimize/ClassAndMemberPublicizer.java
+++ b/src/main/java/com/android/tools/r8/optimize/ClassAndMemberPublicizer.java
@@ -107,7 +107,7 @@
 
     if (!accessFlags.isStatic()) {
       // If this method is mentioned in keep rules, do not transform (rule applications changed).
-      if (rootSet.noShrinking.containsKey(encodedMethod)) {
+      if (rootSet.noShrinking.containsKey(encodedMethod.method)) {
         return false;
       }
 
@@ -121,7 +121,7 @@
       boolean wasSeen = methodPoolCollection.markIfNotSeen(holder, encodedMethod.method);
       if (wasSeen) {
         // We can't do anything further because even renaming is not allowed due to the keep rule.
-        if (rootSet.noObfuscation.contains(encodedMethod)) {
+        if (rootSet.noObfuscation.contains(encodedMethod.method)) {
           return false;
         }
         // TODO(b/111118390): Renaming will enable more private instance methods to be publicized.