commit dde56c61b5618c9317e04bd11b6b14d1d24b1188
author Christoffer Adamsen <christofferqa@google.com> Thu Nov 07 20:06:39 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Thu Nov 07 20:06:39 2024 +0100
tree 52563452a32522bb460854a03e110b123100a6d7
parent 3bb41df4d63dc076f3303de85218a33645512463

Fix build error due to missing @Override

Change-Id: I99d48e6860cf33bba38d8cbdd811a3468fd374a7

src/main/java/com/android/tools/r8/ir/code/Monitor.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/Monitor.java b/src/main/java/com/android/tools/r8/ir/code/Monitor.java
index 025df81..430f8a4 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Monitor.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Monitor.java
@@ -42,14 +42,6 @@
     return inValues.get(0);
   }
 
-  public boolean isEnter() {
-    return type == MonitorType.ENTER;
-  }
-
-  public boolean isExit() {
-    return type == MonitorType.EXIT;
-  }
-
   @Override
   public void buildDex(DexBuilder builder) {
     // If the monitor object is an argument, we use the argument register for all the monitor
@@ -96,7 +88,7 @@
 
   @Override
   public boolean isMonitorEnter() {
-    return isEnter();
+    return type == MonitorType.ENTER;
   }
 
   @Override

src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
index aa435cf..543d157 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadAndStoreElimination.java
@@ -406,7 +406,7 @@
             } else if (instruction.isInitClass()) {
               handleInitClass(it, instruction.asInitClass());
             } else if (instruction.isMonitor()) {
-              if (instruction.asMonitor().isEnter()) {
+              if (instruction.isMonitorEnter()) {
                 killAllNonFinalActiveFields();
               }
             } else if (instruction.isInvokeDirect()) {