commit 51e66ff7e52241bcd9bb8bed6bb937a6256f6e78
author Clément Béra <clementbera@google.com> Thu Jan 19 14:53:08 2023 +0100
committer Clément Béra <clementbera@google.com> Thu Jan 19 13:53:44 2023 +0000
tree 0d9e0ba7d299e0ac67bc5410bb141e63b94bf3c5
parent 87b372dde22f9052f9fb86770921bdf6cb008ba6

Improve error message when writing InvalidCode

Bug: b/266045293
Change-Id: I192ba2b4320acd274a434ca0797504227c655159

src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java

diff --git a/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java b/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
index acc9161..cc88ca9 100644
--- a/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
@@ -640,6 +640,15 @@
     Code code = method.getDefinition().getCode();
     assert code.isCfWritableCode();
     assert code.estimatedDexCodeSizeUpperBoundInBytes() > 0;
+    if (!code.isCfWritableCode()) {
+      // This should never happen (see assertion above), but desugaring bugs may lead the
+      // CfApplicationWriter to try to write invalid code and we need the better error message.
+      throw new Unreachable(
+          "The CfApplicationWriter cannot write non cf writable code "
+              + code.getClass().getCanonicalName()
+              + " for method "
+              + method.getReference().toSourceString());
+    }
     code.asCfWritableCode()
         .writeCf(method, classFileVersion, appView, namingLens, rewriter, visitor);
   }