commit a8df2455e6b45b39fefc32c75ed914f564906150
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Feb 15 14:08:05 2023 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Feb 15 14:08:05 2023 +0100
tree 1150fa234885dba933a1df09c48e611a0580f451
parent 226b4d5ec1649a008b6f02294db6ab913370c5dc

Fix repeated commit of profile changes

Change-Id: I41815208050415539b4b0307535ecddf95687595

src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
index c9ef3ed..788afd1 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
@@ -88,7 +88,6 @@
       methodsWithCovariantReturnTypeAnnotation.clear();
       covariantReturnTypeMethods.clear();
     }
-    eventConsumer.finished(appView);
   }
 
   private void updateClass(

src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
index a639916..c339dbc 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformerEventConsumer.java
@@ -13,8 +13,6 @@
 
   void acceptCovariantReturnTypeBridgeMethod(ProgramMethod bridge, ProgramMethod target);
 
-  void finished(AppView<?> appView);
-
   static CovariantReturnTypeAnnotationTransformerEventConsumer create(
       ArtProfileCollectionAdditions artProfileCollectionAdditions) {
     if (artProfileCollectionAdditions.isNop()) {
@@ -44,10 +42,5 @@
     public void acceptCovariantReturnTypeBridgeMethod(ProgramMethod bridge, ProgramMethod target) {
       // Intentionally empty.
     }
-
-    @Override
-    public void finished(AppView<?> appView) {
-      // Intentionally empty.
-    }
   }
 }

src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java

diff --git a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java b/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
index 2188363..bac0365 100644
--- a/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
+++ b/src/main/java/com/android/tools/r8/profile/art/rewriting/ArtProfileRewritingCovariantReturnTypeAnnotationTransformerEventConsumer.java
@@ -36,10 +36,4 @@
     additionsCollection.addMethodIfContextIsInProfile(bridge, target);
     parent.acceptCovariantReturnTypeBridgeMethod(bridge, target);
   }
-
-  @Override
-  public void finished(AppView<?> appView) {
-    additionsCollection.commit(appView);
-    parent.finished(appView);
-  }
 }