archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8338661: StackMapTable is invalid if frames appear in dead code

Browse source 
Reviewed-by: liach
This commit is contained in:
Adam Sotona 2024-08-21 08:19:35 +00:00
parent 598169756c
commit e88a3b0574
4 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
View file

@ -53,6 +53,14 @@ public class AttributeHolder {
Util.writeAttributes(buf, attributes);
}
@SuppressWarnings("unchecked")
<A> A get(AttributeMapper<A> am) {
for (Attribute<?> a : attributes)
if (a.attributeMapper() == am)
return (A)a;
return null;
}
boolean isPresent(AttributeMapper<?> am) {
for (Attribute<?> a : attributes)
if (a.attributeMapper() == am)

23
src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
View file

@ -25,20 +25,23 @@
*/
package jdk.internal.classfile.impl;
import java.lang.classfile.Attributes;
import java.lang.classfile.TypeKind;
import java.lang.classfile.attribute.StackMapFrameInfo;
import java.lang.classfile.attribute.StackMapTableAttribute;
import java.lang.classfile.constantpool.ConstantDynamicEntry;
import java.lang.classfile.constantpool.DynamicConstantPoolEntry;
import java.lang.classfile.constantpool.MemberRefEntry;
import java.lang.constant.ClassDesc;
import java.lang.constant.MethodTypeDesc;
import java.nio.ByteBuffer;
import java.util.ArrayDeque;
import java.util.BitSet;
import java.util.List;
import java.util.Queue;
import java.util.stream.Collectors;
import static java.lang.classfile.ClassFile.*;
import java.lang.constant.ClassDesc;
import java.util.stream.Collectors;
public final class StackCounter {
@ -47,6 +50,7 @@ public final class StackCounter {
static StackCounter of(DirectCodeBuilder dcb, BufWriterImpl buf) {
return new StackCounter(
dcb,
dcb.attributes.get(Attributes.stackMapTable()),
buf.thisClass().asSymbol(),
dcb.methodInfo.methodName().stringValue(),
dcb.methodInfo.methodTypeSymbol(),
@ -97,6 +101,7 @@ public final class StackCounter {
}
public StackCounter(LabelContext labelContext,
StackMapTableAttribute smta,
ClassDesc thisClass,
String methodName,
MethodTypeDesc methodDesc,
@ -111,8 +116,20 @@ public final class StackCounter {
this.bytecode = bytecode;
this.cp = cp;
targets = new ArrayDeque<>();
maxStack = stack = rets = 0;
stack = rets = 0;
maxStack = handlers.isEmpty() ? 0 : 1;
for (var h : handlers) targets.add(new Target(labelContext.labelToBci(h.handler), 1));
if (smta != null) {
for (var smfi : smta.entries()) {
int frameStack = smfi.stack().size();
for (var vti : smfi.stack()) {
if (vti == StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_LONG
|| vti == StackMapFrameInfo.SimpleVerificationTypeInfo.ITEM_DOUBLE) frameStack++;
}
if (maxStack < frameStack) maxStack = frameStack;
targets.add(new Target(labelContext.labelToBci(smfi.target()), frameStack));
}
}
maxLocals = isStatic ? 0 : 1;
maxLocals += Util.parameterSlots(methodDesc);
bcs = new RawBytecodeHelper(bytecode);