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

Remove bytecode dialect #16

Closed
wants to merge 20 commits into from
+490 −3,199
Closed

Remove bytecode dialect #16

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0b8b01b
work in progress
asotona Feb 5, 2024
ff5b9f9
work in progress
asotona Feb 5, 2024
f3aecc4
work in progress
asotona Feb 5, 2024
d946b89
work in progress
asotona Feb 5, 2024
1e9aedc
work in progress
asotona Feb 6, 2024
7968c93
Code cleanup
asotona Feb 6, 2024
03f7e19
Code cleanup
asotona Feb 6, 2024
438456e
Code cleanup
asotona Feb 6, 2024
4343a49
applied review suggestions
asotona Feb 7, 2024
73ccdf3
added comment
asotona Feb 7, 2024
bedefa0
Single pass refactoring
asotona Feb 7, 2024
15d7a69
minor formatting
asotona Feb 7, 2024
5deb41f
lifting try catch blocks + test
asotona Feb 7, 2024
0ea8029
fixed stack transition between blocks + added test
asotona Feb 8, 2024
013441b
fixed stack transition through exceptionRegionEnter and exceptionRegi…
asotona Feb 8, 2024
22710f5
work toward following the flow and forked locals
asotona Feb 8, 2024
c4d0018
Implemented skipping of unitialized blocks and dead code detection
asotona Feb 8, 2024
9327e8e
extended TestLiftControl::testConditionalExpression
asotona Feb 9, 2024
e14b826
added more comments to the main lift loop
asotona Feb 9, 2024
645b764
Reverted some locals-related changes
asotona Feb 9, 2024
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
127 changes: 54 additions & 73 deletions src/java.base/share/classes/java/lang/reflect/code/bytecode/BytecodeLift.java
View file
Original file line number Diff line number Diff line change
@@ -127,29 +127,28 @@ public static CoreOps.FuncOp lift(byte[] classdata, String methodName) {
}
// If the frame has operand stack elements then represent as block arguments
if (basicBlock.frame != null) {
for (StackMapFrameInfo.VerificationTypeInfo ost : basicBlock.frame.stack()) {
if (ost instanceof StackMapFrameInfo.SimpleVerificationTypeInfo i) {
switch (i) {
case ITEM_INTEGER ->
b.parameter(TypeDesc.INT);
case ITEM_FLOAT ->
b.parameter(TypeDesc.FLOAT);
case ITEM_DOUBLE ->
b.parameter(TypeDesc.DOUBLE);
case ITEM_LONG ->
b.parameter(TypeDesc.LONG);
case ITEM_NULL -> // @@@
b.parameter(TypeDesc.J_L_OBJECT);
case ITEM_UNINITIALIZED_THIS ->
b.parameter(TypeDesc.ofNominalDescriptor(bytecodeBody.methodModel.parent().get().thisClass().asSymbol()));
case ITEM_TOP ->
throw new IllegalArgumentException("Unexpected item TOP at frame stack.");
for (StackMapFrameInfo.VerificationTypeInfo vti : basicBlock.frame.stack()) {
switch (vti) {
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_INTEGER ->
b.parameter(TypeDesc.INT);
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_FLOAT ->
b.parameter(TypeDesc.FLOAT);
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_DOUBLE ->
b.parameter(TypeDesc.DOUBLE);
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_LONG ->
b.parameter(TypeDesc.LONG);
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_NULL -> // @@@
b.parameter(TypeDesc.J_L_OBJECT);
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_UNINITIALIZED_THIS ->
b.parameter(TypeDesc.ofNominalDescriptor(bytecodeBody.methodModel.parent().get().thisClass().asSymbol()));
case StackMapFrameInfo.ObjectVerificationTypeInfo i ->
b.parameter(TypeDesc.ofNominalDescriptor(i.classSymbol()));
case StackMapFrameInfo.UninitializedVerificationTypeInfo i -> {
// @@@
// label designates the NEW instruction that created the uninitialized value
}
} else if (ost instanceof StackMapFrameInfo.ObjectVerificationTypeInfo i) {
b.parameter(TypeDesc.ofNominalDescriptor(i.classSymbol()));
} else if (ost instanceof StackMapFrameInfo.UninitializedVerificationTypeInfo i) {
// @@@
// label designates the NEW instruction that created the uninitialized value
case StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_TOP ->
throw new IllegalArgumentException("Unexpected item TOP at frame stack.");
}
}
}
@@ -524,62 +523,48 @@ static BytecodeMethodBody createBlocks(MethodModel methodModel) {
List<BytecodeBasicBlock> blocks = new ArrayList<>();
BytecodeBasicBlock currentBlock = new BytecodeBasicBlock();
for (CodeElement ce : codeModel) {
if (ce instanceof LabelTarget labelTarget) {
StackMapFrameInfo frame = labelToFrameMap.get(labelTarget.label());
if (frame != null) {
// Not first block, nor prior block with non-terminating instruction
if (!currentBlock.instructions.isEmpty()) {
blocks.add(currentBlock);
currentBlock = new BytecodeBasicBlock();
switch (ce) {
case LabelTarget labelTarget -> {
StackMapFrameInfo frame = labelToFrameMap.get(labelTarget.label());
if (frame != null) {
// Not first block, nor prior block with non-terminating instruction
if (!currentBlock.instructions.isEmpty()) {
blocks.add(currentBlock);
currentBlock = new BytecodeBasicBlock();
}
currentBlock.setFrame(frame);
}

currentBlock.setFrame(frame);
blockMap.put(labelTarget.label(), currentBlock);
currentBlock.addInstruction(ce);
}

blockMap.put(labelTarget.label(), currentBlock);
currentBlock.addInstruction(ce);
} else if (ce instanceof BranchInstruction ||
ce instanceof TableSwitchInstruction ||
ce instanceof LookupSwitchInstruction) {
// End of block, branch
currentBlock.addInstruction(ce);

blocks.add(currentBlock);
currentBlock = new BytecodeBasicBlock();
} else if (ce instanceof ReturnInstruction || ce instanceof ThrowInstruction) {
// End of block, method terminating instruction,
currentBlock.addInstruction(ce);

blocks.add(currentBlock);
currentBlock = new BytecodeBasicBlock();
} else {
currentBlock.addInstruction(ce);
case BranchInstruction _, TableSwitchInstruction _, LookupSwitchInstruction _,
ReturnInstruction _, ThrowInstruction _ -> {
// End of block, branch
currentBlock.addInstruction(ce);
blocks.add(currentBlock);
currentBlock = new BytecodeBasicBlock();
}
default ->
currentBlock.addInstruction(ce);
}
}

// Update successors
for (int i = 0; i < blocks.size(); i++) {
BytecodeBasicBlock b = blocks.get(i);
CodeElement lastElement = b.lastInstruction();
switch (lastElement) {
case BranchInstruction bi when bi.opcode().isUnconditionalBranch() -> {
BytecodeBasicBlock branch = blockMap.get(bi.target());
b.addSuccessor(branch);
}
case BranchInstruction bi -> {
switch (bi.opcode()) {
case GOTO, GOTO_W -> {
BytecodeBasicBlock branch = blockMap.get(bi.target());
b.addSuccessor(branch);
}
// Conditional branch
default -> {
assert !bi.opcode().isUnconditionalBranch();

BytecodeBasicBlock tBranch = blockMap.get(bi.target());
BytecodeBasicBlock fBranch = blocks.get(i + 1);
// True branch is first
b.addSuccessor(tBranch);
// False (or continuation) branch is second
b.addSuccessor(fBranch);
}
}
// Conditional branch
BytecodeBasicBlock tBranch = blockMap.get(bi.target());
BytecodeBasicBlock fBranch = blocks.get(i + 1);
// True branch is first
b.addSuccessor(tBranch);
// False (or continuation) branch is second
b.addSuccessor(fBranch);
}
case LookupSwitchInstruction si -> {
// Default label is first successor
@@ -592,10 +577,7 @@ static BytecodeMethodBody createBlocks(MethodModel methodModel) {
addSuccessors(si.cases(), blockMap, b);
}
// @@@ Merge cases and use _, after merge with master
case ReturnInstruction ri -> {
// Ignore, method terminating
}
case ThrowInstruction ti -> {
case ReturnInstruction _, ThrowInstruction _ -> {
// Ignore, method terminating
}
default -> {
@@ -606,7 +588,6 @@ static BytecodeMethodBody createBlocks(MethodModel methodModel) {
}
}
}

return new BytecodeMethodBody(methodModel, codeModel, blocks, blockMap);
}