commit a12ad03380f7439ebeb2416d4a21034771950d01
author Mikaël Peltier <mikaelpeltier@google.com> Mon Oct 23 09:03:14 2017 +0200
committer Mikaël Peltier <mikaelpeltier@google.com> Mon Oct 23 09:03:14 2017 +0200
tree 17e2393b3c3c9013efc62fc80bbf9049f6b07072
parent 4db4626a9231d689e09f8f9a7c4440f6c1319f20

Enable IntLongMath checker of error prone

- This checker avoid that an expression of type int may
overflow before being assigned to a long.
- Do not longer use long where it is not needed since an
integer can be used from a dex specification point of view.

Bug:
Change-Id: I392a1f79f0c89659bcb02063be4233ea1b104eb3

build.gradle

diff --git a/build.gradle b/build.gradle
index 6dadb5c..35da63e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,8 @@
     '-Xep:OperatorPrecedence:WARN',
     '-Xep:RemoveUnusedImports:WARN',
     '-Xep:MissingOverride:WARN',
-    '-Xep:OvershadowingSubclassFields:WARN']
+    '-Xep:OvershadowingSubclassFields:WARN',
+    '-Xep:IntLongMath:WARN']
 
 apply from: 'copyAdditionalJctfCommonFiles.gradle'
 

src/main/java/com/android/tools/r8/ir/code/Switch.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/Switch.java b/src/main/java/com/android/tools/r8/ir/code/Switch.java
index e962d90..9493fa7 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Switch.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Switch.java
@@ -68,12 +68,14 @@
   }
 
   // Size of the switch payload if emitted as packed (in code units).
-  static public long packedPayloadSize(int keys[]) {
+  // This size can not exceed Constants.U16BIT_MAX * 2 + 4 and can be contained in an integer.
+  private static int packedPayloadSize(int keys[]) {
     return (numberOfTargetsForPacked(keys) * 2) + 4;
   }
 
   // Size of the switch payload if emitted as sparse (in code units).
-  public static long sparsePayloadSize(int keys[]) {
+  // This size can not exceed Constants.U16BIT_MAX * 4 + 2 and can be contained in an integer.
+  private static int sparsePayloadSize(int keys[]) {
     return (keys.length * 4) + 2;
   }
 
@@ -84,7 +86,7 @@
    * @param keys the switch keys
    * @return Size of the switch payload instruction in code units
    */
-  public static long payloadSize(List<Integer> keys) {
+  public static int payloadSize(List<Integer> keys) {
     return payloadSize(Ints.toArray(keys));
   }
 
@@ -93,8 +95,8 @@
    *
    * @see #payloadSize(List)
    */
-  public static long payloadSize(int keys[]) {
-    long sparse = sparsePayloadSize(keys);
+  public static int payloadSize(int keys[]) {
+    int sparse = sparsePayloadSize(keys);
     if (canBePacked(keys)) {
       return Math.min(sparse, packedPayloadSize(keys));
     } else {
@@ -112,12 +114,12 @@
   }
 
   // Size of the switch payload if emitted as packed (in code units).
-  private long packedPayloadSize() {
+  private int packedPayloadSize() {
     return packedPayloadSize(keys);
   }
 
   // Size of the switch payload if emitted as sparse (in code units).
-  private long sparsePayloadSize() {
+  private int sparsePayloadSize() {
     return sparsePayloadSize(keys);
   }
 

src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index 256194d..e948ace 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -494,7 +494,7 @@
             }
 
             // Get the existing dex size for the payload and switch.
-            long currentSize = Switch.payloadSize(keys) + Switch.estimatedDexSize();
+            int currentSize = Switch.payloadSize(keys) + Switch.estimatedDexSize();
 
             // Never replace with more than 10 if/switch instructions.
             if (outliers.size() + sequences.size() <= 10) {