commit 42a6e31b84dbffe037636da2816d865d45ac6a99
author Ian Zerny <zerny@google.com> Mon Feb 24 14:37:51 2020 +0100
committer Ian Zerny <zerny@google.com> Mon Feb 24 14:37:51 2020 +0100
tree 52265597e4c9d216bd0cd537abc391d1089e3887
parent c0756b99b59c14bca4c412903a6202962265dbc9

Revert change to asserts.

Change-Id: Ibccfab100c9b5c60695a473654d768edd24876c4

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index f50b99d..1b481d1 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1670,6 +1670,8 @@
   }
 
   private void transitionMethodsForInstantiatedClass(DexProgramClass clazz, KeepReason reason) {
+    assert !clazz.isAnnotation();
+    assert !clazz.isInterface();
     transitionMethodsForInstantiatedObject(
         InstantiatedObject.of(clazz), clazz, Collections.emptyList(), reason);
   }
@@ -1686,8 +1688,6 @@
       DexClass clazz,
       List<DexType> interfaces,
       KeepReason instantiationReason) {
-    assert !clazz.isAnnotation();
-    assert !clazz.isInterface();
     ScopedDexMethodSet seen = new ScopedDexMethodSet();
     WorkList<DexType> worklist = WorkList.newIdentityWorkList();
     worklist.addIfNotSeen(interfaces);