commit 494609e9482a5d481eda4d02cdaf8c780961741f
author Søren Gjesse <sgjesse@google.com> Fri May 29 15:35:12 2020 +0200
committer Søren Gjesse <sgjesse@google.com> Tue Jun 02 09:37:12 2020 +0000
tree a2743bf9f5535d8be93be5b4fdb18ae3f6fe6deb
parent 76dff502470f97379464d91c5da3703d60b0f229

Update ASM version to 8.0

Change-Id: Iad6597e02449965eca92093240b68c7c05319fae

build.gradle

diff --git a/build.gradle b/build.gradle
index cec21ac..919888b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@
 
 ext {
     androidSupportVersion = '25.4.0'
-    asmVersion = '7.2'
+    asmVersion = '8.0'
     espressoVersion = '3.0.0'
     fastutilVersion = '7.2.0'
     guavaVersion = '23.0'
@@ -2399,4 +2399,4 @@
       println commandLine.join(' ')
     }
   }
-}
\ No newline at end of file
+}

src/main/java/com/android/tools/r8/graph/JarClassFileReader.java

diff --git a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
index 1f04cca..7936e33 100644
--- a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
@@ -110,7 +110,7 @@
     if (application.options.getProguardConfiguration() != null) {
       ProguardKeepAttributes keep =
           application.options.getProguardConfiguration().getKeepAttributes();
-      if (!keep.sourceFile && !keep.sourceDebugExtension) {
+      if (!keep.sourceFile && !keep.sourceDebugExtension && !keep.methodParameters) {
         parsingOptions |= SKIP_DEBUG;
       }
     }

src/main/java/com/android/tools/r8/graph/LazyCfCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
index 06f8c42..6c93947 100644
--- a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
@@ -1008,8 +1008,9 @@
             || keep.localVariableTypeTable
             || reachabilitySensitive;
     boolean lineInfo = keep.lineNumberTable;
+    boolean methodParaeters = keep.methodParameters;
 
-    if (!localsInfo && !lineInfo) {
+    if (!localsInfo && !lineInfo && !methodParaeters) {
       parsingOptions |= ClassReader.SKIP_DEBUG;
     }