8338623: StackCounter adding extraneous slots for receiver invoke ins…

…tructions
liachmodded · Aug 20, 2024 · 54123c8 · 54123c8
1 parent 55851a3
commit 54123c8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
@@ -313,13 +313,14 @@ public StackCounter(LabelContext labelContext,
                         var cpe = cp.entryByIndex(bcs.getIndexU2());
                         var nameAndType = opcode == INVOKEDYNAMIC ? ((DynamicConstantPoolEntry)cpe).nameAndType() : ((MemberRefEntry)cpe).nameAndType();
                         var mtd = Util.methodTypeSymbol(nameAndType);
-                        addStackSlot(Util.slotSize(mtd.returnType()) - Util.parameterSlots(mtd));
+                        var delta = Util.slotSize(mtd.returnType()) - Util.parameterSlots(mtd);
                         if (opcode != INVOKESTATIC && opcode != INVOKEDYNAMIC) {
-                            addStackSlot(-1);
+                            delta--;
                         }
+                        addStackSlot(delta);
                     }
                     case MULTIANEWARRAY ->
-                        addStackSlot (1 - bcs.getU1(bcs.bci + 3));
+                        addStackSlot(1 - bcs.getU1(bcs.bci + 3));
                     case JSR -> {
                         addStackSlot(+1);
                         jump(bcs.dest()); //here we lost track of the exact stack size after return from subroutine

diff --git a/test/jdk/jdk/classfile/StackMapsTest.java b/test/jdk/jdk/classfile/StackMapsTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Testing Classfile stack maps generator.
- * @bug 8305990 8320222 8320618 8335475
+ * @bug 8305990 8320222 8320618 8335475 8338623
  * @build testdata.*
  * @run junit StackMapsTest
  */
@@ -40,10 +40,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static java.lang.constant.ConstantDescs.MTD_void;
 import static org.junit.jupiter.api.Assertions.*;
 import static helpers.TestUtil.assertEmpty;
 import static java.lang.classfile.ClassFile.ACC_STATIC;
+import static java.lang.constant.ConstantDescs.*;
 
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
@@ -341,4 +341,31 @@ void testEmptyCounters(ClassFile.StackMapsOption option) {
             }
         }
     }
+
+    private static final MethodTypeDesc MTD_int = MethodTypeDesc.of(CD_int);
+    private static final MethodTypeDesc MTD_int_String = MethodTypeDesc.of(CD_int, CD_String);
+
+    @ParameterizedTest
+    @EnumSource(ClassFile.StackMapsOption.class)
+    void testInvocationCounters(ClassFile.StackMapsOption option) {
+        var cf = ClassFile.of(option);
+        var cd = ClassDesc.of("Test");
+        var bytes = cf.build(cd, clb -> clb
+            .withMethodBody("a", MTD_int_String, ACC_STATIC, cob -> cob
+                    .aload(0)
+                    .invokevirtual(CD_String, "hashCode", MTD_int)
+                    .ireturn())
+            .withMethodBody("b", MTD_int, 0, cob -> cob
+                    .aload(0)
+                    .invokevirtual(cd, "hashCode", MTD_int)
+                    .ireturn())
+        );
+
+        var cm = ClassFile.of().parse(bytes);
+        for (var method : cm.methods()) {
+            var code = method.findAttribute(Attributes.code()).orElseThrow();
+            assertEquals(1, code.maxLocals());
+            assertEquals(1, code.maxStack());
+        }
+    }
 }