| commit | 9423b413c63ef742f902efa4ca63a0d6d132e526 | [log] [tgz] |
|---|---|---|
| author | Mads Ager <ager@google.com> | Wed Aug 23 15:42:59 2017 +0200 |
| committer | Mads Ager <ager@google.com> | Wed Aug 23 15:42:59 2017 +0200 |
| tree | cf5014540f1560c834249a6aee6301123ebeacd7 | |
| parent | 2e98605d52cfdcdf4b7af709fc96655e9a079f65 [diff] |
Merge https://r8-review.googlesource.com/4600 to 0.1 branch. R=mikaelpeltier@google.com Bug: Change-Id: Ib715a2e077e0100c7a9028f0b5bf814bda98a445
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java index ed992a3..5346836 100644 --- a/src/main/java/com/android/tools/r8/D8.java +++ b/src/main/java/com/android/tools/r8/D8.java
@@ -55,7 +55,7 @@ */ public final class D8 { - private static final String VERSION = "v0.1.0"; + private static final String VERSION = "v0.1.1"; private static final int STATUS_ERROR = 1; private D8() {}
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java index da90e82..4dc90c8 100644 --- a/src/main/java/com/android/tools/r8/R8.java +++ b/src/main/java/com/android/tools/r8/R8.java
@@ -71,7 +71,7 @@ public class R8 { - private static final String VERSION = "v0.1.0"; + private static final String VERSION = "v0.1.1"; private final Timing timing = new Timing("R8"); private final InternalOptions options;
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 78d8369..815efe4 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
@@ -632,6 +632,7 @@ InvokeVirtual invoke = put.inValue().definition.asInvokeVirtual(); if ((invoke.getInvokedMethod() == dexItemFactory.classMethods.getSimpleName || invoke.getInvokedMethod() == dexItemFactory.classMethods.getName) + && !invoke.inValues().get(0).isPhi() && invoke.inValues().get(0).definition.isConstClass() && invoke.inValues().get(0).definition.asConstClass().getValue() == method.method.getHolder()) {