commit 849c2c19d9320620e8c2ee4202e7308f9ceb9cc0
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 22 11:34:30 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 22 11:30:05 2021 +0000
tree 049113747c59ebd24886514034e4558733304532
parent 109ad58d7c124bc6c7c25c536f0ecb4ab7c85b20

Update stack height computation for lambda main methods

Change-Id: Ib688ce78edaf845a160810cc628112a89104d682

src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java b/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
index d1cd87a..cbab081 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/LambdaMainMethodSourceCode.java
@@ -237,9 +237,8 @@
       maxLocals += valueType.requiredRegisters();
       DexType expectedParamType = implReceiverAndArgs.get(i + capturedValues);
       maxStack +=
-          valueType.requiredRegisters()
-              + prepareParameterValue(
-                  erasedParams[i], enforcedParams[i], expectedParamType, instructions, factory);
+          prepareParameterValue(
+              erasedParams[i], enforcedParams[i], expectedParamType, instructions, factory);
     }
 
     instructions.add(
@@ -259,13 +258,15 @@
     } else {
       // Either the new instance or the called-method result is on top of stack.
       assert constructorTarget || !methodToCallReturnType.isVoidType();
-      maxStack +=
-          prepareReturnValue(
-              erasedReturnType,
-              enforcedReturnType,
-              constructorTarget ? methodToCall.holder : methodToCallReturnType,
-              instructions,
-              factory);
+      maxStack =
+          Math.max(
+              maxStack,
+              prepareReturnValue(
+                  erasedReturnType,
+                  enforcedReturnType,
+                  constructorTarget ? methodToCall.holder : methodToCallReturnType,
+                  instructions,
+                  factory));
       instructions.add(new CfReturn(ValueType.fromDexType(enforcedReturnType)));
     }
 
@@ -360,12 +361,9 @@
       Builder<CfInstruction> instructions,
       DexItemFactory factory) {
     internalAdjustType(fromType, toType, returnType, instructions, factory);
-    int inSize = ValueType.fromDexType(fromType).requiredRegisters();
-    int outSize = ValueType.fromDexType(toType).requiredRegisters();
-    if (outSize > inSize) {
-      return outSize - inSize;
-    }
-    return 0;
+    return Math.max(
+        ValueType.fromDexType(fromType).requiredRegisters(),
+        ValueType.fromDexType(toType).requiredRegisters());
   }
 
   private static void internalAdjustType(