| commit | 1db2ce84a598191afe7d28f8a0826c6cb89c75fd | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Feb 19 08:21:31 2020 +0100 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Wed Feb 19 08:21:31 2020 +0100 |
| tree | c59108caba61436e9347319f98f2ff8bc54e540d | |
| parent | ce784ce1e45e941218c5bc170f94b390422592ed [diff] |
Version 1.6.71 Cherry-pick: Add test and fix for not blocking super call in static methods CL: https://r8-review.googlesource.com/48885 Bug: 149522381 Change-Id: I71f93a0703c3e323000f4d1a381afb58af8954b2
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 23ad589..b58e056 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.6.70"; + public static final String LABEL = "1.6.71"; private Version() { }
diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java index 4a84371..8468bae 100644 --- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java +++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -959,10 +959,7 @@ add(directMethods, resultingDirectMethod, MethodSignatureEquivalence.get()); deferredRenamings.map(directMethod.method, resultingDirectMethod.method); deferredRenamings.recordMove(directMethod.method, resultingDirectMethod.method); - - if (!directMethod.isStatic()) { - blockRedirectionOfSuperCalls(resultingDirectMethod.method); - } + blockRedirectionOfSuperCalls(resultingDirectMethod.method); } }