infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8339368: Switch targets are not inflated in CodeModel if no StackMap

Browse Source 
Reviewed-by: liach
This commit is contained in:
Adam Sotona 2024-09-06 07:43:38 +00:00
parent 7db4d46c39
commit a35fd38610
2 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
View File

@ -258,6 +258,14 @@ public final class CodeImpl
switch (i) {
case BranchInstruction br -> br.target();
case DiscontinuedInstruction.JsrInstruction jsr -> jsr.target();
case LookupSwitchInstruction ls -> {
ls.defaultTarget();
ls.cases();
}
case TableSwitchInstruction ts -> {
ts.defaultTarget();
ts.cases();
}
default -> {}
}
pos += i.sizeInBytes();

57
test/jdk/jdk/classfile/OneToOneTest.java
View File

@ -24,16 +24,11 @@
/*
* @test
* @summary Testing ClassFile class writing and reading.
* @bug 8339368
* @run junit OneToOneTest
*/
import java.lang.constant.ClassDesc;
import static java.lang.classfile.ClassFile.ACC_PUBLIC;
import static java.lang.classfile.ClassFile.ACC_STATIC;
import static java.lang.constant.ConstantDescs.*;
import java.lang.constant.MethodTypeDesc;
import java.util.List;
import java.lang.reflect.AccessFlag;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassFile;
@ -41,22 +36,20 @@ import java.lang.classfile.Instruction;
import java.lang.classfile.Label;
import java.lang.classfile.MethodModel;
import java.lang.classfile.attribute.SourceFileAttribute;
import static org.junit.jupiter.api.Assertions.*;
import java.lang.classfile.instruction.*;
import java.util.List;
import org.junit.jupiter.api.Test;
import java.lang.classfile.instruction.ConstantInstruction;
import java.lang.classfile.instruction.StoreInstruction;
import java.lang.classfile.instruction.BranchInstruction;
import java.lang.classfile.instruction.LoadInstruction;
import java.lang.classfile.instruction.OperatorInstruction;
import java.lang.classfile.instruction.FieldInstruction;
import java.lang.classfile.instruction.InvokeInstruction;
import static java.lang.classfile.ClassFile.ACC_PUBLIC;
import static java.lang.classfile.ClassFile.ACC_STATIC;
import static java.lang.classfile.Opcode.*;
import static java.lang.constant.ConstantDescs.*;
import static helpers.TestConstants.CD_PrintStream;
import static helpers.TestConstants.CD_System;
import static helpers.TestConstants.MTD_INT_VOID;
import static helpers.TestConstants.MTD_VOID;
import static java.lang.classfile.Opcode.*;
import static org.junit.jupiter.api.Assertions.*;
class OneToOneTest {
@ -156,4 +149,36 @@ class OneToOneTest {
}
assertTrue(found);
}
@Test
void testJava5ClassWriteRead() {
MethodModel mm = ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("MyClass"), clb -> clb
.withVersion(ClassFile.JAVA_5_VERSION, 0)
.withMethodBody("switches", MTD_void, ACC_STATIC, cob -> {
Label l1 = cob.newLabel(), l2 = cob.newLabel(), l3 = cob.newLabel(), l4 = cob.newLabel();
cob.iconst_0()
.tableswitch(l1, List.of(SwitchCase.of(0, l2)))
.labelBinding(l1)
.nop()
.labelBinding(l2)
.iconst_0()
.lookupswitch(l3, List.of(SwitchCase.of(0, l4)))
.labelBinding(l3)
.nop()
.labelBinding(l4)
.return_();
}))).methods().getFirst();
var it = mm.code().orElseThrow().iterator();
while (!(it.next() instanceof ConstantInstruction));
assertTrue(it.next() instanceof TableSwitchInstruction tsi
&& it.next() instanceof LabelTarget lt1 && lt1.label().equals(tsi.defaultTarget())
&& it.next() instanceof NopInstruction
&& it.next() instanceof LabelTarget lt2 && lt2.label().equals(tsi.cases().getFirst().target())
&& it.next() instanceof ConstantInstruction
&& it.next() instanceof LookupSwitchInstruction lsi
&& it.next() instanceof LabelTarget lt3 && lt3.label().equals(lsi.defaultTarget())
&& it.next() instanceof NopInstruction
&& it.next() instanceof LabelTarget lt4 && lt4.label().equals(lsi.cases().getFirst().target()),
() -> mm.code().get().elementList().toString());
}
}