Fix merge with "Replace nullable bit in TypeLatticeElement with NullLatticeElement."
Bug: 122634266
Change-Id: Id64bdba62a30424caf558e6c04a0bab86277b64d
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 7d297ff..5938781 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
@@ -5,6 +5,7 @@
package com.android.tools.r8.ir.optimize;
import static com.android.tools.r8.ir.analysis.type.Nullability.definitelyNotNull;
+import static com.android.tools.r8.ir.analysis.type.Nullability.maybeNull;
import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.CANONICAL_NAME;
import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.NAME;
import static com.android.tools.r8.ir.optimize.ReflectionOptimizer.ClassNameComputationInfo.ClassNameComputationOption.SIMPLE_NAME;
@@ -1577,9 +1578,11 @@
private boolean checkArgumentType(InvokeMethod invoke, int argumentIndex) {
// TODO(sgjesse): Insert cast if required.
TypeLatticeElement returnType =
- TypeLatticeElement.fromDexType(invoke.getInvokedMethod().proto.returnType, false, appInfo);
+ TypeLatticeElement.fromDexType(
+ invoke.getInvokedMethod().proto.returnType, maybeNull(), appInfo);
TypeLatticeElement argumentType =
- TypeLatticeElement.fromDexType(getArgumentType(invoke, argumentIndex), false, appInfo);
+ TypeLatticeElement.fromDexType(
+ getArgumentType(invoke, argumentIndex), maybeNull(), appInfo);
if (appView != null && appView.enableWholeProgramOptimizations()) {
return argumentType.lessThanOrEqual(returnType, appInfo);
} else {
