commit | c3b10bf7649101dceff14a0d9403b02930d2e285 | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Jan 13 11:58:04 2022 +0100 |
committer | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Jan 13 11:58:04 2022 +0100 |
tree | 4f1d33e747e883fd39921feb0e2af383b73249e4 | |
parent | 43b68d1a3bdbedb3301124e8c0deb791aa219e32 [diff] |
Account for null type in return type strengthening Change-Id: I120ff9ddf691b1be926ae0a76cb1382a847ca922
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorProgramOptimizer.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorProgramOptimizer.java index 2a5a4cd..4890dd9 100644 --- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorProgramOptimizer.java +++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorProgramOptimizer.java
@@ -820,7 +820,9 @@ assert newReturnTypeElement.isTop() || newReturnTypeElement.lessThanOrEqual(staticType.toTypeElement(appView), appView); if (!newReturnTypeElement.isClassType()) { - assert newReturnTypeElement.isArrayType() || newReturnTypeElement.isTop(); + assert newReturnTypeElement.isArrayType() + || newReturnTypeElement.isNullType() + || newReturnTypeElement.isTop(); return null; } DexType newReturnType = newReturnTypeElement.asClassType().toDexType(dexItemFactory);