| commit | 0af1ce44f0acd52d96c9377fc722f4045b2d45c7 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Sep 30 15:12:56 2021 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Sep 30 13:13:18 2021 +0000 |
| tree | 8ff402d65c21ad048729c21e2d5b28d43f2fe9ef | |
| parent | d3d355dbfc3c558330e2ea28bb3cc9fed7833359 [diff] |
Fix merge to R8 3.1 Change-Id: Id4a9a2b9309e61f556b9ae6a830f0d399d444c5f
diff --git a/src/main/java/com/android/tools/r8/graph/RewrittenPrototypeDescription.java b/src/main/java/com/android/tools/r8/graph/RewrittenPrototypeDescription.java index c016016..67e2a4f 100644 --- a/src/main/java/com/android/tools/r8/graph/RewrittenPrototypeDescription.java +++ b/src/main/java/com/android/tools/r8/graph/RewrittenPrototypeDescription.java
@@ -388,6 +388,10 @@ && argumentInfoCollection.isEmpty(); } + public boolean hasExtraParameters() { + return !extraParameters.isEmpty(); + } + public Collection<ExtraParameter> getExtraParameters() { return extraParameters; }
diff --git a/src/main/java/com/android/tools/r8/verticalclassmerging/InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java b/src/main/java/com/android/tools/r8/verticalclassmerging/InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java index e97d8c5..c871d8c 100644 --- a/src/main/java/com/android/tools/r8/verticalclassmerging/InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java +++ b/src/main/java/com/android/tools/r8/verticalclassmerging/InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.java
@@ -58,8 +58,7 @@ DexMethod originalInvokedMethod = originalInvoke.getInvokedMethod(); DexMethod rewrittenInvokedMethod = rewrittenInvoke.getInvokedMethod(); if (lookupResult.getPrototypeChanges().getArgumentInfoCollection().hasRemovedArguments()) { - // There is no argument removal before the primary optimization pass. - assert false; + // Invokes with removed arguments are not handled in R8 3.1. return; }