commit 495b65e85a11474facf077254aceda372b567b42
author Ian Zerny <zerny@google.com> Tue Mar 28 09:29:14 2023 +0200
committer Ian Zerny <zerny@google.com> Tue Mar 28 13:59:08 2023 +0000
tree 04c10eb4c243b0cb2d259a3234b5a1a81ba54a42
parent 0c4d18567d1dc80e0d0ed4412db7b2397f83bad2

Extract out a delegation base for timing.

Change-Id: I688b55e2f66a109a246f0a65fbbc11816212a640

src/main/java/com/android/tools/r8/utils/Timing.java

diff --git a/src/main/java/com/android/tools/r8/utils/Timing.java b/src/main/java/com/android/tools/r8/utils/Timing.java
index dc7db26..7fef060 100644
--- a/src/main/java/com/android/tools/r8/utils/Timing.java
+++ b/src/main/java/com/android/tools/r8/utils/Timing.java
@@ -62,13 +62,11 @@
     return Timing.EMPTY;
   }
 
-  private static class TimingWithCancellation extends Timing {
-    private final InternalOptions options;
+  private abstract static class TimingDelegateBase extends Timing {
     private final Timing timing;
 
-    TimingWithCancellation(InternalOptions options, Timing timing) {
-      super("<cancel>", false);
-      this.options = options;
+    public TimingDelegateBase(String title, Timing timing) {
+      super(title);
       this.timing = timing;
     }
 
@@ -79,9 +77,6 @@
 
     @Override
     public void begin(String title) {
-      if (options.checkIfCancelled()) {
-        throw new CancelCompilationException();
-      }
       timing.begin(title);
     }
 
@@ -106,6 +101,23 @@
     }
   }
 
+  private static class TimingWithCancellation extends TimingDelegateBase {
+    private final InternalOptions options;
+
+    TimingWithCancellation(InternalOptions options, Timing timing) {
+      super("<cancel>", timing);
+      this.options = options;
+    }
+
+    @Override
+    public void begin(String title) {
+      if (options.checkIfCancelled()) {
+        throw new CancelCompilationException();
+      }
+      super.begin(title);
+    }
+  }
+
   public static Timing create(String title, InternalOptions options) {
     // We also create a timer when running assertions to validate wellformedness of the node stack.
     Timing timing =