commit 19c6fc7894981762c181ca25daf17ac4a48df589
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 15:26:15 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 15:26:15 2021 +0100
tree 5a1c820832aba78ad201d9aabcf770f78a18c9e9
parent cd64049af8735b97e0f4b23bad5104a928b25c1b

Fix bad merge in AlwaysTrueClassInlinerMethodConstraint

Change-Id: I6e6593a785f045d9e2c788e79fbbcf22d3e211f9

src/main/java/com/android/tools/r8/ir/optimize/classinliner/constraint/AlwaysTrueClassInlinerMethodConstraint.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/constraint/AlwaysTrueClassInlinerMethodConstraint.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/constraint/AlwaysTrueClassInlinerMethodConstraint.java
index 30ae12b..dc89cf4 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/constraint/AlwaysTrueClassInlinerMethodConstraint.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/constraint/AlwaysTrueClassInlinerMethodConstraint.java
@@ -4,8 +4,11 @@
 
 package com.android.tools.r8.ir.optimize.classinliner.constraint;
 
+import com.android.tools.r8.graph.AppView;
 import com.android.tools.r8.graph.ProgramMethod;
+import com.android.tools.r8.ir.analysis.value.ObjectState;
 import com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage;
+import com.android.tools.r8.shaking.AppInfoWithLiveness;
 
 public class AlwaysTrueClassInlinerMethodConstraint implements ClassInlinerMethodConstraint {
 
@@ -34,7 +37,11 @@
   }
 
   @Override
-  public boolean isEligibleForStaticGetClassInlining(ProgramMethod method, int parameter) {
+  public boolean isEligibleForStaticGetClassInlining(
+      AppView<AppInfoWithLiveness> appView,
+      int parameter,
+      ObjectState objectState,
+      ProgramMethod context) {
     return true;
   }
 }