commit e904990e616255bc3d2674230fe7f9d69e229998
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 26 07:05:55 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 26 07:05:55 2021 +0200
tree 867a6c1d30a2babe6b9d571fa1aab5ce3406aece
parent 8cca36c3b679236b656b9a6efde8f44e79cbeb4c

Handle INVALID_KOTLIN_INFO in expects Kotlin info assert

Change-Id: Ia59ccdc5f5c5bd497b7e834f020adbe63ead33a7

src/main/java/com/android/tools/r8/kotlin/KotlinMetadataEnqueuerExtension.java

diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataEnqueuerExtension.java b/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataEnqueuerExtension.java
index 6de3385..2907d72 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataEnqueuerExtension.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinMetadataEnqueuerExtension.java
@@ -115,10 +115,11 @@
               clazz.removeAnnotations(
                   annotation -> annotation.getAnnotationType() == kotlinMetadataType);
             } else {
-              boolean shouldNotHaveKotlinInfo =
-                  !(keepMetadata
-                      && hasKotlinClassMetadataAnnotation(clazz, definitionsForContext(clazz)));
-              assert clazz.getKotlinInfo().isNoKotlinInformation() == shouldNotHaveKotlinInfo;
+              boolean shouldHaveKotlinInfo =
+                  keepMetadata
+                      && hasKotlinClassMetadataAnnotation(clazz, definitionsForContext(clazz));
+              boolean hasKotlinInfo = clazz.getKotlinInfo() != getNoKotlinInfo();
+              assert hasKotlinInfo == shouldHaveKotlinInfo;
             }
           });
     }