commit | 4b930d2b9c3e5cfd2c177148c30151bf9d8b688e | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Feb 25 15:12:37 2019 +0100 |
committer | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Feb 25 15:12:37 2019 +0100 |
tree | f74303fde7bede6b9ee0f4be12cbd656713719ad | |
parent | 2b92ed416a84b5e98c8a4f5d79602e802c7f2647 [diff] |
Version 1.4.59 This CL fixes a type error in 1.4.58 that arose when merging https://r8-review.googlesource.com/c/r8/+/34652 to 1.4. Bug: 124842076 Change-Id: Ic852aa7f4a8d6b299fb338b129e5daf0dd286a95
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 417e032..3fe4334 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 = "1.4.58"; + public static final String LABEL = "1.4.59"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java index 5c0e9c1..37441ac 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -737,7 +737,7 @@ // TODO(b/124842076) Extend this check to use checksNullReceiverBeforeAnySideEffect. InvokeMethodWithReceiver invokeMethodWithReceiver = invoke.asInvokeMethodWithReceiver(); Value receiver = invokeMethodWithReceiver.getReceiver(); - if (receiver.getTypeLattice().nullability().isNullable()) { + if (receiver.getTypeLattice().isNullable()) { return false; } }