Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8343436: Regression in StackMapGenerator after JDK-8339205 #21828

Closed
wants to merge 1 commit into from
+21 −2
Closed

8343436: Regression in StackMapGenerator after JDK-8339205 #21828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -1111,7 +1111,7 @@ Frame decStack(int size) {
Frame decStack1PushStack(Type type1, Type type2) {
int stackSize = this.stackSize - 1;
if (stackSize < 0) throw stackUnderflow();
checkStack(stackSize + 2);
checkStack(stackSize + 1);
stack[stackSize ] = type1;
stack[stackSize + 1] = type2;
this.stackSize = stackSize + 2;
21 changes: 20 additions & 1 deletion test/jdk/jdk/classfile/StackMapsTest.java
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
/*
* @test
* @summary Testing Classfile stack maps generator.
* @bug 8305990 8320222 8320618 8335475 8338623 8338661
* @bug 8305990 8320222 8320618 8335475 8338623 8338661 8343436
* @build testdata.*
* @run junit StackMapsTest
*/
@@ -344,8 +344,27 @@ void testEmptyCounters(ClassFile.StackMapsOption option) {
}
}

@ParameterizedTest
@EnumSource(ClassFile.StackMapsOption.class)
void testI2LCounters(ClassFile.StackMapsOption option) {
var cf = ClassFile.of(option);
var bytes = cf.build(ClassDesc.of("Test"), clb -> clb
.withMethodBody("a", MTD_long_int, ACC_STATIC, cob ->
cob.iload(0)
.i2l()
.lreturn()));

var cm = ClassFile.of().parse(bytes);
for (var method : cm.methods()) {
var code = (CodeAttribute) method.code().orElseThrow();
assertEquals(1, code.maxLocals());
assertEquals(2, code.maxStack());
}
}

private static final MethodTypeDesc MTD_int = MethodTypeDesc.of(CD_int);
private static final MethodTypeDesc MTD_int_String = MethodTypeDesc.of(CD_int, CD_String);
private static final MethodTypeDesc MTD_long_int = MethodTypeDesc.of(CD_long, CD_int);

@ParameterizedTest
@EnumSource(ClassFile.StackMapsOption.class)