commit | e803ff4a038ded1bc7d40a3114fbf8524e50cce6 | [log] [tgz] |
---|---|---|
author | Søren Gjesse <sgjesse@google.com> | Fri Oct 06 14:03:45 2017 +0200 |
committer | Søren Gjesse <sgjesse@google.com> | Fri Oct 06 12:10:43 2017 +0000 |
tree | 416c2bf7fff1b1a4281e700da54165c9ea8551cc | |
parent | 9cdb1ddd9484f3f865ee4b69f323829b1021f1b1 [diff] |
Version 0.1.15 Merge: Handle missing fields in static initializer rewriting CL: https://r8-review.googlesource.com/c/r8/+/8242 Change-Id: Ice1674b9b1ca2a7b797e5b276324e159c027fe79
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java index 7280fc3..53f88d1 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.14"; + private static final String VERSION = "v0.1.15"; 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 f723d7b..f08e688 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.14"; + private static final String VERSION = "v0.1.15"; 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 c0b5f44..cf89455 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
@@ -709,6 +709,10 @@ for (StaticPut put : dominatingPuts.values()) { DexField field = put.getField(); DexEncodedField encodedField = appInfo.definitionFor(field); + if (encodedField == null) { + // See b/67468748. + continue; + } if (field.type == dexItemFactory.stringType) { if (put.inValue().isConstant()) { if (put.inValue().getConstInstruction().isConstNumber()) {