commit 73f4944761bc0e5abfa79a7f4e2c34b2b83c35f8
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Mar 05 09:52:48 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Mar 05 10:20:33 2021 +0000
tree 0a7504fe68ac99eb8d5b1a5a3b336267c3189f73
parent 12e584126fce42b7ed9ba7553571c337467e6df0

Do not check for maxStack when desugaring CfMultiNewArray

Bug: 181835354
Bug: 181185068
Change-Id: I663e5ffc35812aed6c321ddf16561e08b80f2bc1

src/main/java/com/android/tools/r8/graph/LazyCfCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
index ba22b16..08bc5f0 100644
--- a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
@@ -336,6 +336,7 @@
     private final DebugParsingOptions debugParsingOptions;
     private int maxStack;
     private int maxLocals;
+    private boolean desugaredVisitMultiANewArrayInstruction;
     private List<CfInstruction> instructions;
     private List<CfTryCatch> tryCatchRanges;
     private List<LocalVariableInfo> localVariables;
@@ -386,7 +387,12 @@
       }
       code.setCode(
           new CfCode(
-              method.holder, maxStack, maxLocals, instructions, tryCatchRanges, localVariables));
+              method.holder,
+              desugaredVisitMultiANewArrayInstruction ? Integer.MAX_VALUE : maxStack,
+              maxLocals,
+              instructions,
+              tryCatchRanges,
+              localVariables));
     }
 
     @Override
@@ -948,6 +954,7 @@
       // ..., ref
       visitTypeInsn(Opcodes.CHECKCAST, desc);
       // ..., arrayref(of type : desc)
+      desugaredVisitMultiANewArrayInstruction = true;
     }
 
     @Override