commit ba6e82fa7fc245f785fad779ba8430661053e1c2
author Christoffer Quist Adamsen <christofferqa@google.com> Sat Mar 06 20:02:29 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Sat Mar 06 20:02:29 2021 +0100
tree 0992c8409b71c1b12a006756b4b18fd20a6756ee
parent 5519157d6a2144e2806f5581b2e21134accb3525

Remove cf version requirement from class merger

Change-Id: Ifacc367b8dfe83281e88b2231ff330e3270a5070

src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
index 9be5702..0e7d164 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
@@ -137,8 +137,6 @@
       CfVersion cfVersion = classInitializerSynthesizedCode.getCfVersion();
       if (cfVersion != null) {
         clinit.upgradeClassFileVersion(cfVersion);
-      } else {
-        assert appView.options().isGeneratingDex();
       }
       classMethodsBuilder.addDirectMethod(clinit);
     }