commit 7e066354fab9c29b6c3ccac3df86baa6d0cb0b48
author Søren Gjesse <sgjesse@google.com> Tue Feb 23 15:34:06 2021 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Feb 23 14:36:05 2021 +0000
tree db1f6efd5d984ba1f77dd52ea8edcf7fc7735c3e
parent a0aebfa822e8bd05b23d5d5fd0e851c4f8869925

Fix calculation of stack height for forwarding method

Bug: 181010693
Change-Id: Idbadba9ab93f3a0e42be4552bf81874235be60a4

src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java b/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
index 0b340af..84acf70 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
@@ -177,6 +177,7 @@
       DexType parameter = sourceParameters[i];
       ValueType parameterType = ValueType.fromDexType(parameter);
       instructions.add(new CfLoad(parameterType, maxLocals));
+      maxStack += parameterType.requiredRegisters();
       maxLocals += parameterType.requiredRegisters();
       maybeInsertArgumentCast(i, parameter, instructions);
     }