commit 9feb440fa9ac44d28a9037c4fc9710b0f0c7c070
author Tamas Kenez <tamaskenez@google.com> Thu Apr 25 13:05:20 2019 +0200
committer Tamas Kenez <tamaskenez@google.com> Thu Apr 25 13:05:20 2019 +0200
tree fc1925bd90b91fb059be3245d6827d5ca410f6c7
parent ffae5d04a968bc372c5500f08d6dedcd2191e003

Fix a few minor issues.

Change-Id: Ia768f72b4a1568a9698cc0bd618a6c94311a8e88

src/main/java/com/android/tools/r8/D8Logger.java

diff --git a/src/main/java/com/android/tools/r8/D8Logger.java b/src/main/java/com/android/tools/r8/D8Logger.java
index f0791b0..6c3fca0 100644
--- a/src/main/java/com/android/tools/r8/D8Logger.java
+++ b/src/main/java/com/android/tools/r8/D8Logger.java
@@ -38,9 +38,9 @@
       String[] absArgs = Arrays.stream(args)
           .map(s -> s.startsWith("-") ? s : Paths.get(s).toAbsolutePath().toString())
           .toArray(String[]::new);
-      FileWriter fw = new FileWriter(output, true);
-      fw.write(String.join("\t", absArgs) + "\n");
-      fw.close();
+      try (FileWriter fw = new FileWriter(output, true)) {
+        fw.write(String.join("\t", absArgs) + System.lineSeparator());
+      }
     }
 
     if (Arrays.stream(args).anyMatch(s -> s.equals("--dex"))) {

src/main/java/com/android/tools/r8/JarDiff.java

diff --git a/src/main/java/com/android/tools/r8/JarDiff.java b/src/main/java/com/android/tools/r8/JarDiff.java
index 025f637..7a2ac2f 100644
--- a/src/main/java/com/android/tools/r8/JarDiff.java
+++ b/src/main/java/com/android/tools/r8/JarDiff.java
@@ -165,9 +165,7 @@
     class1.forEachMethod(
         method1 -> {
           DexEncodedMethod method2 = class2.lookupMethod(method1.method);
-          if (method2 == null) {
-            compareMethods(method1, method2);
-          }
+          compareMethods(method1, method2);
         });
     class2.forEachMethod(
         method2 -> {

src/main/java/com/android/tools/r8/R8.java

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index c46d391..195d658 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -370,8 +370,9 @@
                     StandardOpenOption.CREATE,
                     StandardOpenOption.TRUNCATE_EXISTING,
                     StandardOpenOption.WRITE);
-            PrintStream ps = new PrintStream(outputStream);
-            ps.println(compatibility.buildRaw().toString());
+            try (PrintStream ps = new PrintStream(outputStream)) {
+              ps.println(compatibility.buildRaw().toString());
+            }
           }
         }
       } finally {

src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
index b49b5a8..a6e556d 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
@@ -223,12 +223,10 @@
       int previousInstructionCount = dexInstructions.size();
       info.addInstructions(this, dexInstructions);
       int instructionStartOffset = instructionOffset;
-      if (previousInstructionCount < dexInstructions.size()) {
-        while (previousInstructionCount < dexInstructions.size()) {
-          Instruction instruction = dexInstructions.get(previousInstructionCount++);
-          instruction.setOffset(instructionOffset);
-          instructionOffset += instruction.getSize();
-        }
+      while (previousInstructionCount < dexInstructions.size()) {
+        Instruction instruction = dexInstructions.get(previousInstructionCount++);
+        instruction.setOffset(instructionOffset);
+        instructionOffset += instruction.getSize();
       }
       debugEventBuilder.add(instructionStartOffset, instructionOffset, ir);
     }

src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
index 722866a..69f9819 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
@@ -1313,7 +1313,7 @@
       }
       case Opcodes.POP: {
         Slot value = state.pop();
-        value.isCategory1();
+        assert value.isCategory1();
         break;
       }
       case Opcodes.POP2: {

src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
index 13d5c77..aaffa88 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/ClassInliner.java
@@ -27,12 +27,10 @@
 
 public final class ClassInliner {
 
-  private final AppView<AppInfoWithLiveness> appView;
   private final LambdaRewriter lambdaRewriter;
   private final ConcurrentHashMap<DexClass, Boolean> knownClasses = new ConcurrentHashMap<>();
 
   public ClassInliner(AppView<AppInfoWithLiveness> appView, LambdaRewriter lambdaRewriter) {
-    this.appView = appView;
     this.lambdaRewriter = lambdaRewriter;
   }
 
@@ -204,7 +202,7 @@
   private boolean isClassEligible(AppView<AppInfoWithLiveness> appView, DexClass clazz) {
     Boolean eligible = knownClasses.get(clazz);
     if (eligible == null) {
-      Boolean computed = computeClassEligible(appView, clazz);
+      boolean computed = computeClassEligible(appView, clazz);
       Boolean existing = knownClasses.putIfAbsent(clazz, computed);
       assert existing == null || existing == computed;
       eligible = existing == null ? computed : existing;