commit cfd5e4eef15cd0651ac785050f5a93c27ef8fca3
author Mikael Peltier <mikaelpeltier@google.com> Wed Oct 18 06:25:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 18 06:25:49 2017 +0000
tree d0ab4f5787f8dd9a30d67f04b97006e7285f1cf0
parent 5bcbe8d5825eb2f764f9e72d4d44734b024607e8
parent 0e4efd4316ac8d86d02dbec8b357af7ff37e7c25

Merge "Adapt invalid name tests to run them on Java 9 runtime"

build.gradle

diff --git a/build.gradle b/build.gradle
index 583ae9e..e50073d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,8 @@
     '-Xep:ReferenceEquality:OFF',
     '-Xep:ClassCanBeStatic:WARN',
     '-Xep:OperatorPrecedence:WARN',
-    '-Xep:RemoveUnusedImports:WARN']
+    '-Xep:RemoveUnusedImports:WARN',
+    '-Xep:MissingOverride:WARN']
 
 apply from: 'copyAdditionalJctfCommonFiles.gradle'
 
@@ -151,10 +152,10 @@
     })
     compile group: 'it.unimi.dsi', name: 'fastutil', version: '7.2.0'
     compile group: 'org.apache.commons', name: 'commons-compress', version: '1.12'
-    compile group: 'org.ow2.asm', name: 'asm', version: '6.0_BETA'
-    compile group: 'org.ow2.asm', name: 'asm-commons', version: '6.0_BETA'
-    compile group: 'org.ow2.asm', name: 'asm-tree', version: '6.0_BETA'
-    compile group: 'org.ow2.asm', name: 'asm-util', version: '6.0_BETA'
+    compile group: 'org.ow2.asm', name: 'asm', version: '6.0'
+    compile group: 'org.ow2.asm', name: 'asm-commons', version: '6.0'
+    compile group: 'org.ow2.asm', name: 'asm-tree', version: '6.0'
+    compile group: 'org.ow2.asm', name: 'asm-util', version: '6.0'
     testCompile sourceSets.examples.output
     testCompile 'junit:junit:4.12'
     testCompile group: 'org.smali', name: 'smali', version: '2.2b4'
@@ -164,8 +165,8 @@
     jctfCommonCompile 'junit:junit:4.12'
     jctfTestsCompile 'junit:junit:4.12'
     jctfTestsCompile sourceSets.jctfCommon.output
-    examplesAndroidOCompile group: 'org.ow2.asm', name: 'asm', version: '6.0_BETA'
-    examplesAndroidPCompile group: 'org.ow2.asm', name: 'asm', version: '6.0_BETA'
+    examplesAndroidOCompile group: 'org.ow2.asm', name: 'asm', version: '6.0'
+    examplesAndroidPCompile group: 'org.ow2.asm', name: 'asm', version: '6.0'
     examplesCompile 'com.google.protobuf:protobuf-lite:3.0.0'
     examplesRuntime 'com.google.protobuf:protobuf-lite:3.0.0'
     supportLibs 'com.android.support:support-v4:25.4.0'

src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java

diff --git a/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java b/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
index 374f496..fe0ff72 100644
--- a/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
+++ b/src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
@@ -58,9 +58,10 @@
           return;
         }
         Code code = encodedMethod.getCode();
-        if (code == null || !code.isDexCode()) {
+        if (code == null) {
           return;
         }
+        assert code.isDexCode();
         DexCode dexCode = code.asDexCode();
         for (Instruction instr : dexCode.instructions) {
           if (instr instanceof ConstString) {

src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java

diff --git a/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java b/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
index 38f8cb3..c10d0d7 100644
--- a/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
+++ b/src/main/java/com/android/tools/r8/naming/SourceFileRewriter.java
@@ -47,15 +47,15 @@
           return;
         }
         Code code = encodedMethod.getCode();
-        // Other kinds of {@link Code} do not have debug_info_item.
-        if (code == null || !code.isDexCode()) {
+        if (code == null) {
           return;
         }
-        if (code.asDexCode().getDebugInfo() == null) {
+        assert code.isDexCode();
+        DexDebugInfo dexDebugInfo = code.asDexCode().getDebugInfo();
+        if (dexDebugInfo == null) {
           return;
         }
         // Thanks to a single global source file, we can safely remove DBG_SET_FILE entirely.
-        DexDebugInfo dexDebugInfo = code.asDexCode().getDebugInfo();
         dexDebugInfo.events =
             Arrays.stream(dexDebugInfo.events)
                 .filter(dexDebugEvent -> !(dexDebugEvent instanceof SetFile))