commit 7782b0bb50869b953bad861021a704a470a9a250
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Apr 13 10:35:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 13 10:35:15 2018 +0000
tree 14200d5c7ea96710077013478d8879c6b2d6e6c9
parent 14e80e58dcaeb993d96ecb0cb2f9f8422a28119b
parent df4f001526aec8460d5e99eb5dac590f6a163651

Merge "Use ranged invoke if input arguments are consecutive"

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

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 210a632..cde7e93 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "v1.2.9-dev";
+  public static final String LABEL = "v1.2.10-dev";
 
   private Version() {
   }

src/test/java/com/android/tools/r8/dexfilemerger/DexFileMergerTests.java

diff --git a/src/test/java/com/android/tools/r8/dexfilemerger/DexFileMergerTests.java b/src/test/java/com/android/tools/r8/dexfilemerger/DexFileMergerTests.java
index e7b666c..2b2a40b 100644
--- a/src/test/java/com/android/tools/r8/dexfilemerger/DexFileMergerTests.java
+++ b/src/test/java/com/android/tools/r8/dexfilemerger/DexFileMergerTests.java
@@ -38,7 +38,7 @@
 
   @Rule public TemporaryFolder temp = ToolHelper.getTemporaryFolderForTest();
 
-  private Path createMergerInputWithTwoClasses(OutputMode outputMode, boolean dontCreateMarkerInD8)
+  private Path createMergerInputWithTwoClasses(OutputMode outputMode, boolean addMarker)
       throws CompilationFailedException, CompilationException, IOException {
     // Compile Class1 and Class2
     Path mergerInputZip = temp.newFolder().toPath().resolve("merger-input.zip");
@@ -49,18 +49,18 @@
             .addProgramFiles(Paths.get(CLASS2_CLASS))
             .build();
 
-    DexFileMergerHelper.runD8ForTesting(command, dontCreateMarkerInD8);
+    DexFileMergerHelper.runD8ForTesting(command, !addMarker);
 
     return mergerInputZip;
   }
 
-  private void testMarkerPreservedOrNotAdded(boolean testNotAdding)
+  private void testMarker(boolean addMarkerToInput)
       throws CompilationFailedException, CompilationException, IOException, ResourceException,
           ExecutionException {
-    Path mergerInputZip = createMergerInputWithTwoClasses(OutputMode.DexIndexed, testNotAdding);
+    Path mergerInputZip = createMergerInputWithTwoClasses(OutputMode.DexIndexed, addMarkerToInput);
 
     Marker inputMarker = ExtractMarker.extractMarkerFromDexFile(mergerInputZip);
-    assertEquals(inputMarker == null, testNotAdding);
+    assertEquals(addMarkerToInput, inputMarker != null);
 
     Path mergerOutputZip = temp.getRoot().toPath().resolve("merger-out.zip");
     DexFileMerger.main(
@@ -69,21 +69,21 @@
         });
 
     Marker outputMarker = ExtractMarker.extractMarkerFromDexFile(mergerOutputZip);
-    assertEquals(outputMarker == null, testNotAdding);
+    assertEquals(addMarkerToInput, outputMarker != null);
   }
 
   @Test
   public void testMarkerPreserved()
       throws CompilationFailedException, CompilationException, IOException, ResourceException,
           ExecutionException {
-    testMarkerPreservedOrNotAdded(false);
+    testMarker(true);
   }
 
   @Test
   public void testMarkerNotAdded()
       throws CompilationFailedException, CompilationException, IOException, ResourceException,
           ExecutionException {
-    testMarkerPreservedOrNotAdded(true);
+    testMarker(false);
   }
 
   @Test